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
d907e79140
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 00c222377d
2023-06-05 20:49:35 +02:00
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
2023-06-05 13:31:45 +02:00
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
2023-06-05 13:28:22 +02:00
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
2023-06-05 13:28:02 +02:00
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
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
2023-06-04 22:05:45 +02:00
fca2dff2e2
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
2023-06-01 09:25:26 +02:00
44cd88adc4
Upgrade react-intl ( #24906 )
2023-05-31 23:43:39 +02:00
00c222377d
Remove unused Settings::Extend module ( #25214 )
2023-05-31 23:34:48 +02:00
b7d995cb00
Disable some metrics cops ( #25215 )
2023-05-31 23:33:10 +02:00
b0104e4c33
Silence output to stdout during cli specs ( #25211 )
2023-05-31 20:01:11 +02:00
dc26140d54
Use thor methods instead of tty prompt in maintenance cli ( #25207 )
2023-05-31 19:40:16 +02:00
3c41547f49
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
2023-05-31 15:32:37 +02:00
8b1bfaed3e
Add specs for admin/webhooks CRUD actions ( #25133 )
2023-05-31 15:23:49 +02:00
665bb237a8
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
2023-05-31 10:23:32 +02:00
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
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
2023-05-31 09:57:24 +02:00
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
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
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
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
bf9a7ce8e8
Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )
2023-05-31 09:33:57 +02:00
98e5e011aa
Upgrade Workbox to 6.6.0 ( #25197 )
2023-05-31 09:29:16 +02:00
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
c2ea0dc65f
Drop support for Node.js 14 ( #25198 )
2023-05-31 08:42:40 +02:00
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
2023-05-30 19:01:42 +02:00
1baf40077b
Fix FormatStringToken cop in CLI ( #25122 )
2023-05-30 16:21:53 +02:00
dbc44be0ca
Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )
2023-05-30 16:13:29 +02:00
80c7de9984
Fix Rails/WhereExists cop in CLI ( #25123 )
2023-05-30 16:09:57 +02:00
b7b96efd17
Extract helper method for error report in cli/accounts command ( #25119 )
2023-05-30 16:09:15 +02:00
2cecb2dc9e
Increment index which was previously not used in maintenance CLI loop ( #25118 )
2023-05-30 16:08:47 +02:00
ec9bc7e604
Consistent usage of CLI `dry_run?` method ( #25116 )
2023-05-30 16:07:44 +02:00
3d253b9830
Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )
2023-05-30 15:00:21 +02:00
bbbcdc083f
Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )
2023-05-30 11:59:17 +02:00
44eaa979d4
Bump @types/react from 18.2.6 to 18.2.7 ( #25166 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:58:55 +02:00
4869384fa0
Bump jsdom from 22.0.0 to 22.1.0 ( #25178 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:43:20 +02:00
05c2d4dab2
Bump nokogiri from 1.14.3 to 1.15.2 ( #25177 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:42:41 +02:00
66c1ad8be9
Bump @types/react-motion from 0.0.33 to 0.0.34 ( #25185 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:40:22 +02:00
5f1a03fdba
Bump @typescript-eslint/parser from 5.59.7 to 5.59.8 ( #25175 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:38:42 +02:00
6d41cdcc6a
Bump @typescript-eslint/eslint-plugin from 5.59.7 to 5.59.8 ( #25182 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:34:59 +02:00
8ff2d61add
Bump @types/lodash from 4.14.194 to 4.14.195 ( #25184 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:33:21 +02:00
b91aeeb94f
Bump sidekiq from 6.5.8 to 6.5.9 ( #25176 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:29:40 +02:00
37dc48c3a1
Bump postcss from 8.4.23 to 8.4.24 ( #25169 )
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-05-30 09:28:39 +02:00
8c183a9831
Align argument type to keyword argument for private process method in FetchResourceService ( #25189 )
2023-05-30 09:28:01 +02:00
bdc7548652
Add test coverage for `Mastodon::CLI::Accounts#modify` ( #25145 )
2023-05-29 15:31:59 +02:00
64b960b6b3
Handle Surrogate Pairs in truncate() ( #25148 )
2023-05-29 11:55:16 +02:00
11b8336418
Add test coverage for `Mastodon::CLI::Accounts#create` ( #25143 )
2023-05-29 11:43:19 +02:00
5ed48e6878
Fix extraneous newlines
2023-05-28 18:06:09 +02:00
382b2a506a
[Glitch] Rewrite actions/modal and reducers/modal with typescript
...
Port 38c6216082
2023-05-28 17:49:55 +02:00
Claire