Claire
2c622497c2
Merge commit '407287573c9c602c5490224c43639b39edf7d48a' into glitch-soc/merge-upstream
2024-03-15 18:48:39 +01:00
renovate[bot]
52200b6bbf
Update dependency sass to v1.72.0 ( #29586 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-15 11:41:55 +00:00
Claire
a5127d0ef8
Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream
...
Conflicts:
- `config/routes/api.rb`:
glitch-soc has an extra `:destroy` action on notifications for historical reasons.
Kept it for now, while otherwise updating as upstream did.
2024-03-11 17:29:07 +01:00
renovate[bot]
6984f94044
Update dependency autoprefixer to v10.4.18 ( #29475 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-11 09:05:07 +00:00
renovate[bot]
7b89d6842e
Update DefinitelyTyped types (non-major) ( #29543 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-11 08:49:07 +00:00
renovate[bot]
df3798a6fa
Update dependency eslint-plugin-jsdoc to v48.2.1 ( #29544 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-11 08:49:04 +00:00
Claire
45e56db8e4
Merge commit 'f89512fbedb547f66a72eefdff047768fb505eb6' into glitch-soc/merge-upstream
...
Conflicts:
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept our version.
2024-03-05 16:25:50 +01:00
renovate[bot]
4c138ee4eb
Update DefinitelyTyped types (non-major) ( #29502 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-05 09:42:26 +00:00
renovate[bot]
cb0f3ecc28
Update eslint (non-major) ( #29505 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-05 09:41:31 +00:00
renovate[bot]
68600893d2
Update babel monorepo to v7.24.0 ( #29434 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-03-02 18:33:33 +00:00
Claire
4d7e7cc562
Merge commit '6dfe318f34d69066dc0f453a228fdfc6af84b62e' into glitch-soc/merge-upstream
2024-02-29 18:24:47 +01:00
renovate[bot]
6dfe318f34
Update dependency express to v4.18.3 ( #29458 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-29 15:20:39 +00:00
Claire
21e7a53ca5
Merge commit '3b3144740805c1b404934c0f196d6cddc14dac0b' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Conflict due to lines adjacent to the glitch-soc-modified `i18n:extract` one
were changed, but otherwise no real conflict.
Ported upstream's changes and kept glitch-soc's `i18n:extract`.
- `tsconfig.json`:
Upstream's dependencies changed the code style rules for json formatting, and
we had local changes.
Kept our changes, but with upstream's formatting/
- `yarn.lock`:
A dependency textually adjacent to a glitch-soc-only one got changed.
Applied upstream's change, keeping the glitch-soc-only dependency.
2024-02-28 20:27:28 +01:00
Renaud Chaput
3b31447408
Rework Prettier invocation ( #28851 )
2024-02-27 16:09:27 +00:00
renovate[bot]
dc4427dc9b
Update devDependencies (non-major) ( #29089 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-02-27 16:07:43 +00:00
Claire
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
renovate[bot]
b829d261ba
Update DefinitelyTyped types (non-major) ( #29404 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-26 12:52:03 +00:00
renovate[bot]
8fd8b30c24
Update dependency cssnano to v6.0.5 ( #29385 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-26 12:41:34 +00:00
Claire
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
Claire
7901dc9e24
Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 15:33:36 +01:00
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Claire
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
Claire
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
Claire
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
Matt Jankowski
45f71e3954
Update @rails/ujs
to version 7.1.3-2 ( #29359 )
2024-02-22 21:35:14 +00:00
renovate[bot]
82e2370f5f
Update dependency cssnano to v6.0.4 ( #29367 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 21:34:08 +00:00
Wojciech Maj
d908ed8e86
Remove unused dependencies ( #29289 )
2024-02-22 20:45:40 +01:00
renovate[bot]
53a4648db1
Update dependency pino to v8.19.0 ( #29253 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-22 09:03:13 +00:00
Matt Jankowski
006aa4e35a
Update husky and remove deprecated features ( #29338 )
2024-02-22 09:02:15 +00:00
renovate[bot]
c63567a214
Update typescript-eslint monorepo to v7 (major) ( #29179 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 22:06:17 +00:00
renovate[bot]
638861b2a3
Update dependency http-link-header to v1.1.2 ( #29340 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:31:09 +00:00
renovate[bot]
aed60df80e
Update dependency sass to v1.71.1 ( #29238 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:29:41 +00:00
renovate[bot]
bcc0860100
Update dependency core-js to v3.36.0 ( #29197 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:28:53 +00:00
renovate[bot]
df4ed60331
Update dependency dotenv to v16.4.5 ( #29190 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:28:10 +00:00
renovate[bot]
38d0292281
Update dependency @reduxjs/toolkit to v2.2.1 ( #29178 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:27:28 +00:00
renovate[bot]
d48d824d9a
Update DefinitelyTyped types (non-major) ( #29165 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-21 21:27:00 +00:00
Matt Jankowski
581f14e56f
Update yarn to version 4.1.0 ( #29339 )
2024-02-21 21:18:01 +00:00
Wojciech Maj
36fd47ac57
Remove unused dependencies ( #29289 )
2024-02-20 10:10:58 +00:00
renovate[bot]
e1cee84e58
Update dependency cocoon-js-vanilla to v1.4.0 ( #29293 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-20 09:19:41 +00:00
renovate[bot]
fe6c055f35
Update dependency eslint-plugin-jsdoc to v48.1.0 ( #29275 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-19 11:10:03 +00:00
renovate[bot]
e25d9dfb25
Update dependency dotenv to v16.4.3 ( #29174 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-13 08:02:55 +00:00
renovate[bot]
819ede190e
Update dependency dotenv to v16.4.2 ( #29157 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-12 10:39:31 +00:00
renovate[bot]
cf0d6bef8b
Update eslint (non-major) ( #29166 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-12 10:21:17 +00:00
renovate[bot]
52986f35b8
Update dependency postcss to v8.4.35 ( #29136 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-08 09:49:24 +00:00
renovate[bot]
dbafec88e5
Update dependency @reduxjs/toolkit to v2.1.0 ( #28879 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-07 14:10:38 +00:00
renovate[bot]
a31427a629
Update dependency pino to v8.18.0 ( #29043 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 11:33:06 +00:00
renovate[bot]
90f4b8d53a
Update dependency postcss to v8.4.34 ( #29103 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 09:37:03 +00:00
renovate[bot]
916aeb574d
Update DefinitelyTyped types (non-major) ( #29088 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-06 09:23:55 +00:00
renovate[bot]
0bc526a967
Update eslint (non-major) ( #29001 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-01-30 15:39:59 +00:00