Claire
abdb58840a
Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream
2023-09-26 13:13:27 +02:00
renovate[bot]
2054ee7cd5
Update dependency glob to v10.3.9 ( #27148 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 11:12:21 +02:00
renovate[bot]
33a066a952
Update dependency glob to v10.3.8 ( #27145 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-26 10:47:04 +02:00
renovate[bot]
aeeddb9d46
Update DefinitelyTyped types (non-major) ( #27109 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 11:56:21 +02:00
renovate[bot]
82c44f492d
Update dependency glob to v10.3.7 ( #27078 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 11:03:19 +02:00
renovate[bot]
c56d7d702f
Update dependency @reduxjs/toolkit to v1.9.6 ( #27110 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 10:36:46 +02:00
renovate[bot]
1fa40cff70
Update eslint (non-major) ( #27113 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-25 10:09:51 +02:00
Claire
f05985f8ec
Merge branch 'main' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream changed their README, we have a completely different one.
Kept our version.
2023-09-21 15:12:00 +02:00
renovate[bot]
c74670b4d3
Update dependency glob to v10.3.5 ( #27002 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-21 11:06:16 +02:00
renovate[bot]
4ed9d9ca6f
Update dependency autoprefixer to v10.4.16 ( #27000 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-09-21 11:00:15 +02:00
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