b27a9a5903
Merge commit 'e9385e93e9b4601c87d1f5d6b8ddfd815f7aedcb' into glitch-soc/merge-upstream
2023-06-10 15:09:19 +02:00
8188522bde
[Glitch] Fix prev/next buttons color in media viewer
...
Port 675672feb6
2023-06-10 14:48:41 +02:00
7e25fd9b0c
[Glitch] Translate CW, poll options and media descriptions
...
Port 69057467cb
2023-06-10 14:48:41 +02:00
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`.
2023-06-10 14:38:04 +02:00
9e133e2527
[Glitch] Upgrade react-intl
...
Port 44cd88adc4
2023-06-10 14:37:08 +02:00
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
4c9406bdb0
Add time zone preference ( #25342 )
2023-06-10 03:29:37 +02:00
16dd3f08c1
Fix performance of streaming by parsing message JSON once ( #25278 )
2023-06-09 19:29:16 +02:00
e34142782f
Add Ruby & Bundler versions to Gemfile.lock ( #25317 )
2023-06-09 16:34:36 +02:00
75e299f440
Remove unused `redis_info` method Admin::Dashboard ( #25345 )
2023-06-09 14:03:35 +02:00
4aff1d2974
Migrate to request specs in `/api/v1/admin/email_domain_blocks` ( #25337 )
2023-06-09 14:00:14 +02:00
18f092d927
Fix translations for changing theme ( #25340 )
2023-06-08 17:12:41 +02:00
b85c387c5c
Remove reference to deleted statsd config file ( #25336 )
2023-06-07 22:46:53 +02:00
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
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
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
f378f10404
Fix compatibility of recent migration with PostgreSQL 10 ( #25324 )
2023-06-07 01:53:50 +02:00
67d17ce194
Add `legal` as report category ( #23941 )
2023-06-06 23:41:59 +02:00
e4fd9503ec
Change design of dropdowns in web UI ( #25107 )
2023-06-06 21:49:49 +02:00
ed04c277b4
Configure RenovateBot to add proper language labels ( #25316 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Co-authored-by: Nick Schonning <nschonni@gmail.com>
2023-06-06 18:53:43 +02:00
6c0e3f490a
Fix RSpec/MissingExampleGroupArgument cop ( #25310 )
2023-06-06 15:51:42 +02:00
b74c3cd708
Fix `RSpec/DescribedClass` cop missed items ( #25309 )
2023-06-06 14:51:03 +02:00
c66250abf1
Autofix Rubocop Regex Style rules ( #23690 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 14:50:51 +02:00
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
c42591356d
Fix `RSpec/DescribedClass` cop ( #25104 )
2023-06-06 13:58:33 +02:00
1e243e2df7
Misc spec coverage for `Admin::` area controllers ( #25282 )
2023-06-06 13:57:00 +02:00
eb6f8181e1
Add test coverage for `Mastodon::CLI::Accounts#reset_relationships` ( #25194 )
2023-06-06 13:37:09 +02:00
b22bfae4f9
Add coverage for `DomainBlock#public_domain` method ( #25283 )
2023-06-06 13:34:04 +02:00
fb5bf5cbf8
Rewrite `<LoadMore />` as FC and TS ( #25259 )
2023-06-06 11:28:50 +02:00
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
6833732852
Fix autocomplete suggestions being cut off in compose form ( #25275 )
2023-06-06 11:05:25 +02:00
4eda233e09
Add webhook templating ( #23289 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-06 10:42:47 +02:00
a80efb449e
Configure Renovate ( #25255 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2023-06-06 10:42:23 +02:00
0ddc895282
Change follow button in account row to be more obvious in web UI ( #24956 )
2023-06-06 04:14:28 +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
af135bddd0
Update `Admin::Metrics::Measure` classes for Rails 7 ( #25236 )
2023-06-05 20:46:04 +02:00
e428670e61
Fix CSP headers when S3_ALIAS_HOST includes a path component ( #25273 )
2023-06-05 17:35:05 +02:00
1483a3ddfe
Add data-nosnippet so Google doesn't use trending posts in snippets for / ( #25279 )
2023-06-05 17:32:24 +02:00
3b21c13dcc
Rails 7 compatibility fix for `Admin::Metrics::Dimension` classes ( #25277 )
2023-06-05 16:52:33 +02:00
70cd2d6000
Add test coverage for `Mastodon::CLI::Accounts#cull` ( #25250 )
2023-06-05 14:51:25 +02:00
a6c898f501
Fix not shown announcements in hometimeline. ( #25251 )
2023-06-05 14:49:51 +02:00
a8310b15ed
Update kt-paperclip 7.2 from sha ( #25274 )
2023-06-05 14:40: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
c2c396157f
Fix design issues with recent react-intl upgrade ( #25272 )
2023-06-05 09:52:36 +02:00
bacb674921
Add exclusive lists ( #22048 )
...
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-06-05 09:37:02 +02:00
0daf78f903
Add `allow_other_host: true` to backups controller ( #25266 )
2023-06-05 08:22:03 +02:00
5c87c66504
Add coverage for CLI::CanonicalEmailBlocks command ( #25239 )
2023-06-05 08:20:18 +02:00
Claire
Renaud Chaput
Christian Schmidt
Eugen Rochko
Emelia Smith
Matt Jankowski
Daniel M Brasil
jsgoldstein
renovate[bot]
Nick Schonning
alfe
S.H
dependabot[bot]
y.takahashi
Darius Kazemi