93c714417f
Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream
...
Conflicts:
- `package.json`:
Upstream changed various script definitions in lines surrounding the one for
`i18n:extract`, which had glitch-soc-specific changes.
Updated the scripts as upstream did, while keeping our changes to
`i18n:extract`.
1 year ago
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
1 year ago
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.
1 year ago
d907e79140
Merge pull request #2242 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes up to 00c222377d
1 year ago
7fc1297c3e
[Glitch] Bump eslint-plugin-jsdoc from 44.2.5 to 45.0.0
...
Port 89d6341c80
1 year ago
5e876c2901
[Glitch] Fix `null` signUp URL in various places
...
Port 14bb6bb29a
1 year ago
4993b6e800
[Glitch] Handle Surrogate Pairs in truncate()
...
Port 64b960b6b3
1 year ago
c22fc2fa80
Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream
...
Conflicts:
- `.rubocop_todo.yml`:
Took upstream's changes.
1 year ago
ee771f5bad
Fix closeModal invocation ( #2239 )
...
Fixes #2238
Some call sites where missed in 382b2a506a
1 year ago
fca2dff2e2
Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
...
Merge upstream changes
1 year ago
b922ad7a1b
Fix crash when S3_ALIAS_HOST or S3_CLOUDFRONT_HOST have a path component ( #25018 )
1 year ago
2b45fecde1
Fix multiple N+1s in ConversationsController ( #25134 )
1 year ago
675672feb6
Fix prev/next buttons color in media viewer ( #25231 )
1 year ago
d39bce963f
Add fix/lint helper dev targets ( #23561 )
1 year ago
69057467cb
Translate CW, poll options and media descriptions ( #24175 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
1 year ago
44cd88adc4
Upgrade react-intl ( #24906 )
1 year ago
00c222377d
Remove unused Settings::Extend module ( #25214 )
1 year ago
b7d995cb00
Disable some metrics cops ( #25215 )
1 year ago
b0104e4c33
Silence output to stdout during cli specs ( #25211 )
1 year ago
dc26140d54
Use thor methods instead of tty prompt in maintenance cli ( #25207 )
1 year ago
3c41547f49
Add test coverage for `Mastodon::CLI::Accounts#backup` ( #25163 )
1 year ago
8b1bfaed3e
Add specs for admin/webhooks CRUD actions ( #25133 )
1 year ago
665bb237a8
Increase spec coverage for controllers - admin/ip_blocks, admin/relays, admin/rules ( #25192 )
1 year ago
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>
1 year ago
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain ( #25159 )
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
bf9a7ce8e8
Add test coverage for `Mastodon::CLI::Accounts#unfollow` ( #25162 )
1 year ago
98e5e011aa
Upgrade Workbox to 6.6.0 ( #25197 )
1 year ago
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>
1 year ago
c2ea0dc65f
Drop support for Node.js 14 ( #25198 )
1 year ago
14bb6bb29a
Fix `null` signUp URL in various places ( #25190 )
1 year ago
1baf40077b
Fix FormatStringToken cop in CLI ( #25122 )
1 year ago
dbc44be0ca
Add test coverage for `Mastodon::CLI::Accounts#follow` ( #25161 )
1 year ago
80c7de9984
Fix Rails/WhereExists cop in CLI ( #25123 )
1 year ago
b7b96efd17
Extract helper method for error report in cli/accounts command ( #25119 )
1 year ago
2cecb2dc9e
Increment index which was previously not used in maintenance CLI loop ( #25118 )
1 year ago
ec9bc7e604
Consistent usage of CLI `dry_run?` method ( #25116 )
1 year ago
3d253b9830
Add test coverage for `Mastodon::CLI::Accounts#approve` ( #25160 )
1 year ago
bbbcdc083f
Add test coverage for `Mastodon::CLI::Accounts#delete` ( #25146 )
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
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>
1 year ago
Claire
Renaud Chaput
dependabot[bot]
y.takahashi
Nick Schonning
Christian Schmidt
Matt Jankowski
Daniel M Brasil