Claire
63969b15b3
Merge commit '8bffce5f015ace5b73d5a8aa746c02e374d927bb' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added the notion of overriden settings, while we had extra code for
pseudo-settings (only used to combine flavour and skin in a single select
field).
Ported upstream changes.
- `config/i18n-tasks.yml`:
Upstream added `simple_form.overridden` to `ignore_unused`,
we had `simple_form.glitch_only`.
Added `simple_form.glitch_only` as well.
2023-09-02 14:44:47 +02:00
Claire
d38116d584
Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
5d5d0c06d8
Merge commit 'dec7a90989c823dba7f6322c3359c3cd861812e9' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream has updated their README, we have a completely different one.
Kept ours.
- `config/initializers/content_security_policy.rb`:
Upstream has updated their development CSPs, while we disable CSPs in
the development environment.
Kept our version.
2023-09-02 13:31:15 +02:00
Claire
a9fb03b6c0
Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
52ce0a1c1d
Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Gabriel Simmer
8bffce5f01
Move to ioredis for streaming ( #26581 )
...
Co-authored-by: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
2023-09-01 17:44:28 +02:00
renovate[bot]
9c5bcaf188
Update dependency @babel/preset-env to v7.22.14 ( #26732 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-31 10:23:24 +02:00
renovate[bot]
a76a99b2bb
Update dependency webpack-bundle-analyzer to v4.9.1 ( #26733 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-31 09:52:23 +02:00
renovate[bot]
1097ca5377
Update dependency glob to v10.3.4 ( #26734 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-31 09:49:34 +02:00
renovate[bot]
6fc874631a
Update dependency postcss to v8.4.29 ( #26720 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-30 09:44:14 +02:00
renovate[bot]
425af3ef0f
Update dependency axios to v1.5.0 ( #26680 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-29 10:50:27 +02:00
renovate[bot]
85c3155d14
Update dependency @testing-library/jest-dom to v6 ( #26479 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-08-28 12:19:42 +02:00
renovate[bot]
c51564cc67
Update DefinitelyTyped types (non-major) ( #26693 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 11:04:06 +02:00
renovate[bot]
e886929716
Update eslint (non-major) ( #26694 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-28 10:20:02 +02:00
renovate[bot]
c0d98abf00
Update dependency immutable to v4.3.4 ( #26655 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-25 17:02:33 +02:00
renovate[bot]
3a75c0fdc3
Update babel monorepo to v7.22.11 ( #26640 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-25 10:08:44 +02:00
Claire
592a675a33
Merge commit '14de2ab8804ca9c765e99d5d22383cc9079c53f8' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream changed how the nightly builds are versioned, the conflict
is because glitch-soc modified adjacent lines relative to the docker
repositories the images are pushed to.
Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
Upstream moved some settings around. Glitch-soc had more settings.
Applied upstream's changes, moving glitch-soc's extra settings
accordingly.
2023-08-24 21:56:00 +02:00
Claire
2a8e55b0ee
Merge commit '032dfdfb70963ec9dbdad8f40b5056e16680ec86' into glitch-soc/merge-upstream
...
Conflicts:
- `Vagrantfile`:
Upstream bumped a bunch of values, including one that was already bumped by
glitch-soc.
Took upstream's version.
- `lib/paperclip/transcoder.rb`:
glitch-soc already had a partial fix for this.
Took upstream's version.
2023-08-24 21:46:17 +02:00
Claire
17e93dbce5
Merge commit 'b085dcc921497f08e72cb29cf0b5cb07699d9d74' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream re-generated the file, while glitch-soc has a specific ignore
for some file.
Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
Upstream added a plugin, but our files are pretty different.
Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
Upstream refactored tests, but part of them were different because
of glitch-soc's theming system.
Applied the refactoring to glitch-soc's change.
2023-08-24 21:26:27 +02:00
Claire
1f30778ec6
Merge commit 'd38310bed22bdf2be6ef0e49f325715685b74400' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/public.jsx`:
Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
Applied the changes there.
2023-08-24 21:01:19 +02:00
renovate[bot]
deccd70910
Update dependency redis to v4.6.8 ( #26630 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-24 09:59:13 +02:00
renovate[bot]
d0181fc9e6
Update dependency sass to v1.66.1 ( #26534 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:56 +02:00
renovate[bot]
f6ce219c9d
Update dependency immutable to v4.3.3 ( #26622 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 15:45:21 +02:00
renovate[bot]
7c4e4be3c6
Update dependency react-textarea-autosize to v8.5.3 ( #26607 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-23 08:26:30 +02:00
Claire
c52397dea3
Merge commit '8f40a96f28a5cdf5e52c40f57b8adf63165ce6d3' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Renaud Chaput
78aecc7444
Add circular-dependency-plugin
to detect any circular deps issues ( #26600 )
2023-08-22 13:24:16 +02:00
Claire
ccf5f88e43
Merge commit '89b675cb07886dcc72ef52b6f778679d7099d96c' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
renovate[bot]
d38310bed2
Update eslint (non-major) ( #26567 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-21 10:13:21 +02:00
renovate[bot]
a1aaba08a7
Update dependency core-js to v3.32.1 ( #26548 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-21 09:06:33 +02:00
renovate[bot]
8f40a96f28
Update dependency @material-design-icons/svg to v0.14.11 ( #26536 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-18 11:10:05 +02:00
renovate[bot]
5dcf08d912
Update dependency pg to v8.11.3 ( #26519 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-17 16:43:37 +02:00
renovate[bot]
dc779cbd55
Update dependency postcss to v8.4.28 ( #26502 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-16 09:08:57 +02:00
renovate[bot]
7cf538f547
Update dependency autoprefixer to v10.4.15 ( #26473 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-14 13:39:28 +02:00
Renaud Chaput
98912c5caf
Upgrade @types/react
( #26457 )
2023-08-14 09:40:07 +02:00
Claire
33024cca51
Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
Claire
32faa7213f
Merge commit '1c5c1960b9d684fb26be453b34563ba023cb67c5' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
Upstream updated its README, but glitch-soc has a completely different one.
Kept glitch-soc's README
2023-08-11 22:15:41 +02:00
Renaud Chaput
13a4a81f02
Upgrade JS dev dependencies ( #26442 )
2023-08-11 09:59:57 +02:00
renovate[bot]
d28ac3caa8
Update dependency pg-connection-string to v2.6.2 ( #26427 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 11:07:33 +02:00
renovate[bot]
adbe541e5e
Update dependency eslint-import-resolver-typescript to v3.6.0 ( #26429 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 11:07:15 +02:00
renovate[bot]
e530e5737a
Update babel monorepo to v7.22.10 ( #26421 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 11:01:40 +02:00
renovate[bot]
acaeaaeb6a
Update dependency pg to v8.11.2 ( #26426 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 10:59:42 +02:00
renovate[bot]
aa367e4058
Update dependency @rails/ujs to v7.0.7 ( #26422 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 10:44:14 +02:00
renovate[bot]
a0bed9f641
Update dependency regenerator-runtime to ^0.14.0 ( #26432 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 10:39:47 +02:00
renovate[bot]
7aba925071
Update dependency sass to v1.65.1 ( #26433 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 10:23:37 +02:00
renovate[bot]
78760a80f2
Update dependency eslint-config-prettier to v9 ( #26434 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 10:23:00 +02:00
renovate[bot]
37b6cf54bc
Update dependency immutable to v4.3.2 ( #26425 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-10 09:48:41 +02:00
renovate[bot]
84dcc0d054
Update eslint (non-major) ( #26323 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-09 22:21:41 +02:00
renovate[bot]
2a6e6dc53c
Update dependency sass to v1.64.2 ( #26315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-09 22:19:12 +02:00
Emelia Smith
b92b2b1298
Change streaming /metrics
to include additional metrics ( #26299 )
2023-08-04 16:11:30 +02:00
renovate[bot]
22c70db671
Update dependency core-js to v3.32.0 ( #26317 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-03 16:10:55 +02:00