Claire
22ee4e057d
Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream
...
Conflicts:
- `streaming/index.js`:
Upstream has added a parameter to `streamFrom`, while glitch-soc had an
extra parameter.
Ported upstream changes.
2023-09-19 12:59:23 +02:00
Claire
1e87575b70
Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream
2023-09-19 12:53:32 +02:00
renovate[bot]
a83615edc9
Update eslint (non-major) ( #26954 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:51:13 +02:00
renovate[bot]
6eb6209d02
Update DefinitelyTyped types (non-major) ( #26953 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 12:24:26 +02:00
renovate[bot]
6f9f901153
Update dependency postcss to v8.4.30 ( #26964 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-19 11:03:42 +02:00
Claire
9688c5fcc4
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-18 12:09:37 +02:00
renovate[bot]
8b5c61ae3a
Update formatjs monorepo ( #26955 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-18 08:52:49 +02:00
renovate[bot]
04623e2f34
Update babel monorepo to v7.22.20 ( #26946 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-18 08:34:04 +02:00
Claire
dfc05ec8df
Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-nightly.yml`:
Upstream modified this file close to a line modified by glitch-soc to
disable the ARMv64 builder (as glitch-soc doesn't have one).
Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
Upstream modified this file close to lines changed by glitch-soc to
change the Docker image repositories used (only ghcr, and based on the
organization's name).
Ported upstream's changes.
2023-09-15 21:43:49 +02:00
Claire
e193c848fe
Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Upstream added some code to add the Identity Provider's sign-in endpoint to
the `form-action` Content Security Policy directive but our version of the
file is pretty different.
Ported the change.
2023-09-15 21:25:05 +02:00
Claire
08b495d95c
Merge commit 'b1d89071384ef028c97a3d28cf8cf6bc0ca6c4ce' into glitch-soc/merge-upstream
2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7
Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream
2023-09-15 20:57:40 +02:00
renovate[bot]
82015dbab6
Update dependency sass to v1.67.0 ( #26914 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-15 10:03:55 +02:00
renovate[bot]
3103415364
Update dependency @babel/core to v7.22.19 ( #26920 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-15 09:09:22 +02:00
renovate[bot]
93223633fc
Update dependency uuid to v9.0.1 ( #26900 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-12 12:38:52 +02:00
renovate[bot]
f3be4eb0dc
Update dependency @rails/ujs to v7.0.8 ( #26871 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 11:32:30 +02:00
renovate[bot]
3679e67fad
Update dependency @babel/core to v7.22.17 ( #26855 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 11:12:22 +02:00
renovate[bot]
c10142ac3c
Update formatjs monorepo ( #26874 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:54:59 +02:00
renovate[bot]
b1d8907138
Update dependency @types/lodash to v4.14.198 ( #26878 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:26:23 +02:00
renovate[bot]
959ccf5682
Update eslint (non-major) ( #26881 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 10:25:54 +02:00
renovate[bot]
d5155cbc21
Update dependency ws to v8.14.1 ( #26862 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-11 09:59:18 +02:00
Renaud Chaput
e9b528eaee
Use NodeJS v20 by default ( #26830 )
2023-09-08 13:45:34 +02:00
renovate[bot]
712d96b207
Update dependency ws to v8.14.0 ( #26821 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-08 12:43:21 +02:00
renovate[bot]
d0f7d879a6
Update formatjs monorepo ( #26844 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-08 12:42:55 +02:00
renovate[bot]
858ad1f363
Update dependency core-js to v3.32.2 ( #26841 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-07 16:49:31 +02:00
renovate[bot]
b9e2eb5184
Update dependency @material-design-icons/svg to v0.14.12 ( #26832 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-07 14:59:42 +02:00
renovate[bot]
9e3567bfbe
Update dependency webpack to v4.47.0 ( #26825 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-06 22:25:03 +02:00
Claire
e66f961e05
Merge branch 'main' into glitch-soc/merge-upstream
2023-09-04 18:27:46 +02:00
renovate[bot]
ddeca3b37b
Update babel monorepo to v7.22.15 ( #26790 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-04 17:56:47 +02:00
renovate[bot]
3e6a6439b5
Update dependency stylelint-config-standard-scss to v11 ( #26780 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-04 11:02:36 +02:00
renovate[bot]
1f92436745
Update DefinitelyTyped types (non-major) ( #26785 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-04 09:26:33 +02:00
renovate[bot]
173041f02c
Update dependency typescript to v5.2.2 ( #26786 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-04 09:08:53 +02:00
Claire
4ed629cd7e
Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' 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
ffb486648c
Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream
2023-09-02 13:34:54 +02:00
Claire
afc3b12217
Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' 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
c8aa3d6d06
Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream
2023-09-02 12:02:23 +02:00
Claire
6b7c47311d
Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream
2023-09-02 11:41:40 +02:00
Gabriel Simmer
be991f1d18
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]
430eac3eb1
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]
ef9a85a2d8
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]
15949e42c2
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]
24deaf2e4a
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]
a67cf439ee
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]
9d9de8d219
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]
4ea5db90da
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]
fc14d1f3b0
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]
e4c0ce18a3
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]
c66f756522
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
941a9df28a
Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' 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
b6b68b44a1
Merge commit 'b91724fb9d0839365391310e20c2589ff6062d4f' 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
296b3d1560
Merge commit 'dc09c10fa8cc9230bf14e48d790c8f0c26043f8f' 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
fbfc4145fd
Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' 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]
24ea6f851f
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]
34f5b90dc7
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]
de8c2427a5
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]
ea1a221e2d
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
10404aece8
Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream
2023-08-22 18:50:14 +02:00
Renaud Chaput
bb2db2aec0
Add circular-dependency-plugin
to detect any circular deps issues ( #26600 )
2023-08-22 13:24:16 +02:00
Claire
7e25e311d5
Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream
2023-08-21 21:07:39 +02:00
renovate[bot]
1cdcd9dc08
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]
d3b4422b94
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]
1cb978bcc3
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]
b5acf13886
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]
26eaf058e2
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]
c65032fb11
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
1eac3a60de
Upgrade @types/react
( #26457 )
2023-08-14 09:40:07 +02:00
Claire
6530f9709c
Merge commit '121443c0fca383268b8022c048dd137994785aff' 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
44a5f1b64a
Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' 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
121443c0fc
Upgrade JS dev dependencies ( #26442 )
2023-08-11 09:59:57 +02:00
renovate[bot]
3dd3c50811
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]
27d8e9be4a
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]
7572fa21a3
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]
05022c9218
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]
700f948fc9
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]
54dfacafcb
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]
ba318a42fe
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]
c645308c6e
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]
74c422ad0a
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]
26fa4a6e82
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]
59678c6d5d
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
65096c1ccd
Change streaming /metrics
to include additional metrics ( #26299 )
2023-08-04 16:11:30 +02:00
renovate[bot]
f6e4137d7c
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
renovate[bot]
670dae371a
Update dependency react-redux to v8.1.2 ( #26314 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-08-03 16:10:23 +02:00
Eugen Rochko
2cbdff97ce
Change design of role badges in web UI ( #26281 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-08-02 17:24:32 +02:00
Claire
bd349cb850
Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
...
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
2023-07-30 14:58:56 +02:00
renovate[bot]
edc104c9ef
Update dependency sass to v1.64.1 ( #26146 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-25 14:45:35 +02:00
renovate[bot]
3cbc69f13d
Update dependency postcss to v8.4.27 ( #26144 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-24 16:03:49 +02:00
Claire
c04f2d0cf7
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/admin/settings/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
had a different lambda due to its theming system.
Applied the same code style changes.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream enforced an uniform code style around lambdas, and glitch-soc
removed some code just after the lambda.
Applied the same code style changes.
2023-07-17 19:02:23 +02:00
renovate[bot]
2a9063e36a
Update dependency react-select to v5.7.4 ( #26033 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 14:07:36 +02:00
Claire
c943f17b1b
Merge branch 'main' into glitch-soc/merge-upstream
2023-07-17 12:52:15 +02:00
renovate[bot]
7b7a26c895
Update dependency postcss to v8.4.26 ( #26030 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 12:13:01 +02:00
renovate[bot]
f17acbca33
Update dependency immutable to v4.3.1 ( #26029 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 11:39:35 +02:00
renovate[bot]
cdaca7a08b
Update babel monorepo to v7.22.9 ( #26017 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-17 09:38:11 +02:00
Claire
25571b18ed
Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream
2023-07-13 14:22:20 +02:00
Claire
95a1fde6b6
Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
Upstream updated the linter, which changed a few linter rules.
Some of those changed lines are different in glitch-soc because we use
different paths for the assets.
Applied the same style rules on our version of the file.
2023-07-13 13:49:58 +02:00
Claire
2d09653d50
Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream
...
Conflicts:
- app/controllers/application_controller.rb:
Upstream added an `include` where we had an extra `include` due to
glitch-soc's theming system.
Added upstream's new `include`.
2023-07-13 13:35:15 +02:00
renovate[bot]
ba0649f042
Update dependency postcss to v8.4.25 ( #25961 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 12:20:03 +02:00
renovate[bot]
a4e6ff0d53
Update dependency react-textarea-autosize to v8.5.2 ( #25962 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 12:19:54 +02:00
Renaud Chaput
a7253075d1
Upgrade to typescript-eslint
v6 ( #25904 )
2023-07-13 11:49:16 +02:00
Renaud Chaput
73b64b8917
Upgrade to Prettier 3 ( #25902 )
2023-07-13 11:26:45 +02:00
renovate[bot]
0d7340380c
Update dependency glob to v10.3.3 ( #25959 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 11:20:20 +02:00
renovate[bot]
6be9f95a22
Update dependency core-js to v3.31.1 ( #25958 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-13 11:17:46 +02:00
Matt Jankowski
ce43ed144c
Rails 7.0 update ( #25668 )
2023-07-13 09:36:07 +02:00
Claire
9ae60f8738
Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream
...
Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
Upstream ran a lint fix on this file, but this file is different in
glitch-soc because the feature was added much earlier.
Ran the lint fix on our own version of the file.
2023-07-12 16:03:05 +02:00
Claire
2aadebc769
Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-image.yml`:
Upstream changed how releases are tagged, we don't have releases.
Ignored the changes
2023-07-12 15:54:58 +02:00
Renaud Chaput
ecd8e0d612
Update Stylelint ( #25819 )
2023-07-12 12:31:23 +02:00
renovate[bot]
8e0fd2d619
Update babel monorepo ( #25930 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-07-12 09:05:17 +02:00
Eugen Rochko
ba06a2f104
Revert "Rails 7 update" ( #25667 )
2023-07-02 11:14:22 +02:00
Matt Jankowski
50c2a03695
Rails 7 update ( #24241 )
2023-07-02 10:38:53 +02:00
Claire
80a5c16ae1
Merge branch 'main' into glitch-soc/merge-upstream
2023-06-27 13:15:41 +02:00
renovate[bot]
ceca93d0d1
Update dependency glob to v10.3.0 ( #25608 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-27 12:16:17 +02:00
renovate[bot]
dbd37f129d
Update dependency pg to v8.11.1 ( #25604 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-27 10:36:21 +02:00
renovate[bot]
b7f6280ef4
Update dependency pg-connection-string to v2.6.1 ( #25605 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-27 10:21:54 +02:00
renovate[bot]
a90190f813
Update dependency react-textarea-autosize to v8.5.0 ( #25610 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-27 10:20:46 +02:00
renovate[bot]
ccaa676452
Update dependency sass to v1.63.6 ( #25607 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-27 10:20:09 +02:00
renovate[bot]
9caa0475f8
Update dependency react-redux to v8.1.1 ( #25432 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-26 20:59:58 +02:00
Claire
178e151019
Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/user_settings.rb`:
Upstream added a constraint on a setting textually close
to glitch-soc-only settings.
Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream added support for the `translate` attribute on a few elements,
where glitch-soc had a different set of allowed elements and attributes.
Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
Upstream refactored to use RSpec's `instance_double` instead of `double`,
but glitch-soc had changes to tests due to configurable max toot chars.
Applied upstream's changes while keeping tests against configurable max
toot chars.
2023-06-25 14:27:38 +02:00
renovate[bot]
cec4f1d506
Update dependency dotenv to v16.2.0 ( #25506 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-19 11:28:59 +02:00
Claire
6c99479ef4
Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream
...
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
Upstream redesigned the settings page, where glitch-soc had changes because of
the ability to set some custom limits.
Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
Upstream updated dependencies textually close to a glitch-soc-only dependency.
Updated the dependnencies as well.
2023-06-18 13:41:33 +02:00
renovate[bot]
8b2048d0c8
Lock file maintenance ( #25434 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-15 10:13:12 +02:00
renovate[bot]
a6d7abb29d
Update dependency intl-messageformat to v10.5.0 ( #25431 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-15 09:36:10 +02:00
renovate[bot]
36566e9245
Update dependency core-js to v3.31.0 ( #25430 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-14 18:32:55 +02:00
renovate[bot]
841e35e291
Update devDependencies (non-major) ( #25427 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-14 18:12:33 +02:00
renovate[bot]
b9e8d2b352
Update dependency sass to v1.63.3 ( #25422 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-14 11:23:54 +02:00
renovate[bot]
360759df7b
Update formatjs monorepo ( #25418 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-14 11:16:36 +02:00
renovate[bot]
f10f4f2359
Update dependency glob to v10.2.7 ( #25417 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-14 10:56:22 +02:00
renovate[bot]
ae2790d84f
Update babel monorepo to v7.22.5 ( #25405 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-06-14 09:22:54 +02:00
Claire
c48ec9cb8c
Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/content_security_policy.rb`:
Kept our version, it was not affected by upstream's bug.
2023-06-10 16:48:01 +02:00
Claire
734e186717
Merge commit 'b0780cfeeda641645ea65da257a72ec507e71647' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/mastodon/load_locale.js`:
The file moved to `app/javascript/mastodon/locales/load_locale.ts`.
Ported the changes there and deleted `app/javascript/mastodon/load_locale.js`.
- `app/javascript/mastodon/locales/index.js`:
The file moved to `app/javascript/mastodon/locales/index.ts`.
Did *not* port the changes as I want to try something a bit different.
2023-06-10 15:32:29 +02:00
Claire
aa57f7e3e2
Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream
2023-06-10 15:17:08 +02:00
Claire
85722a918d
Merge commit '44cd88adc4e2f4028dcc2b08b98368f0dc90cee4' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/dependabot.yml`:
Updated upstream, but we've deleted it.
Keep it deleted.
- `app/javascript/mastodon/locales/index.js`:
Reworked upstream, but the code was mostly in
`app/javascript/locales/index.js` in glitch-soc.
Updated that file accordingly.
- `app/javascript/packs/public.jsx`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `app/views/layouts/application.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `app/views/layouts/embedded.html.haml`:
Conflict due to locales loading and theme system
discrepancies.
Updated in our own way.
- `config/webpack/generateLocalePacks.js`:
Deleted upstream, as upstream now directly loads the
JSON at runtime.
Deleted as well, will switch to runtime loading in
an upcoming commit.
- `config/webpack/shared.js`:
Not a real conflict, but different imports in
glitch-soc and upstream.
- `config/webpack/translationRunner.js`:
Mostly deleted upstream, to be replaced with `formatjs-formatter.js`
instead.
Moved the glitch-soc logic there and deleted the file.
2023-06-10 12:38:33 +02:00
renovate[bot]
db047e323b
Update dependency webpack-bundle-analyzer to v4.9.0 ( #25327 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 12:05:05 +02:00
renovate[bot]
5265655549
Update dependency dotenv to v16.1.3 ( #25302 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 11:46:40 +02:00
renovate[bot]
7e22287caa
Update dependency sass-loader to v10.4.1 ( #25315 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-07 11:44:09 +02:00
renovate[bot]
9a653899e9
Update dependency redis to v4.6.7 ( #25300 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-06 14:16:41 +02:00
renovate[bot]
50a8f5b8a7
Update dependency react-redux to v8.0.7 ( #25298 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-06-06 11:18:56 +02:00
Claire
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
2023-06-05 13:25:22 +02:00
Renaud Chaput
b0780cfeed
Fix /share
and cleanup and reorganize frontend locale loading ( #25240 )
2023-06-02 15:00:27 +02:00
Nick Schonning
b489c200a6
Update yarn.lock for audit issues ( #25152 )
2023-06-01 14:32:34 +02:00
Claire
dac460f43f
Bump workbox from 6.6.1 to 7.0.0 ( #25232 )
2023-06-01 10:24:11 +02:00
dependabot[bot]
5a50983654
Bump eslint-plugin-jsdoc from 45.0.0 to 46.1.0 ( #25222 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:41:44 +02:00
dependabot[bot]
b05bbd91d0
Bump @types/jest from 29.5.1 to 29.5.2 ( #25220 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-06-01 09:41:03 +02:00
Renaud Chaput
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
dependabot[bot]
82f6d4c418
Bump @babel/core and @types/babel__core ( #25183 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-31 09:57:48 +02:00
dependabot[bot]
b86f3596ba
Bump @babel/plugin-transform-runtime from 7.21.4 to 7.22.4 ( #25173 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-31 09:51:35 +02:00
dependabot[bot]
e24adacea1
Bump @babel/preset-react from 7.18.6 to 7.22.3 ( #25171 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-31 09:42:14 +02:00
dependabot[bot]
e1d0343354
Bump @babel/runtime from 7.21.5 to 7.22.3 ( #25170 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-31 09:39:35 +02:00
dependabot[bot]
0ed8164777
Bump @babel/preset-env from 7.21.5 to 7.22.4 ( #25167 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-05-31 09:36:43 +02:00
Renaud Chaput
98e5e011aa
Upgrade Workbox to 6.6.0 ( #25197 )
2023-05-31 09:29:16 +02:00
dependabot[bot]
89d6341c80
Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0 ( #25172 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-05-31 09:27:21 +02:00