53f5b27bd1
Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream
2023-10-08 17:30:48 +02:00
86c9c5afa0
Merge commit '40ba6e119b7457161fd43b449875d0fb9d473c1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/concerns/web_app_controller_concern.rb`:
Upstream changed the order of Action Controller filters for web app
controllers.
Glitch-soc has an extra filter due to its theming system.
Changed the order accordingly.
- `app/views/settings/preferences/appearance/show.html.haml`:
Conflict due to an extra newline in glitch-soc.
Removed that newline and applied upstream's changes.
2023-10-08 17:26:43 +02:00
ac2370778a
Merge commit 'c676bc91e9c3aa81eb7cfbce3c5c5e80b84d3d02' into glitch-soc/merge-upstream
...
Conflicts:
- `config/environments/production.rb`:
Upstream enforced a code style change and glitch-soc had a few different lines.
Applied upstream's code style to glitch-soc's changes.
2023-10-08 17:21:12 +02:00
74c27e33e3
Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream
2023-10-08 17:10:39 +02:00
8eb09c6f72
[Glitch] Keep version string displayed without breakpoints in UI
...
Port 5a437edc7f
2023-10-08 17:09:02 +02:00
a5dbb1ee5a
Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream
2023-10-08 17:05:40 +02:00
e83059fd9d
[Glitch] Fix explore prompt appearing because of posts being received out of order
...
Port d80a819fc6
2023-10-08 17:03:40 +02:00
e9a181c52c
Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream
2023-10-08 16:53:05 +02:00
702d162998
Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
Not a real conflict. Upstream removed the `set_instance_presenter` private
method from this class, and glitch-soc has an extra private method right
besides it for the theming system.
Removed `set_instance_presenter` as upstream did.
2023-10-08 16:48:19 +02:00
d7fcd70023
Merge commit '2016c5d912f400ae98ee03ce269112de2f9ec62d' into glitch-soc/merge-upstream
...
Conflicts:
- `config/initializers/cors.rb`:
Upstream refactored this file, and glitch-soc had local changes.
I could not find the rationale for the glitch-soc changes, so I
used upstream's version.
2023-10-08 16:41:56 +02:00
cfc0da77ac
[Glitch] Fix retention dashboard not displaying correct month
...
Port 7fddeca190
2023-10-08 16:33:37 +02:00
19ebf7797e
Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream
2023-10-08 16:30:00 +02:00
640421f661
Add 4.2.x to supported versions in SECURITY.md ( #27317 )
2023-10-07 21:12:21 +02:00
3262d1f1b6
Fix incorrect serialization of regional languages in `contentMap` ( #27207 )
2023-10-06 17:46:04 +02:00
3171afc36a
Add Elasticsearch index size to Admin dashboard ( #27301 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-06 17:02:55 +02:00
340c390849
Fix crash when filtering for “dormant” relationships ( #27306 )
2023-10-06 12:58:16 +02:00
4d59dfb1c6
Fix some remote posts getting truncated ( #27307 )
2023-10-06 12:58:02 +02:00
e0b54ed3e1
New Crowdin Translations (automated) ( #27304 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-06 11:49:09 +02:00
027c1bef8d
Update dependency active_model_serializers to v0.10.14 ( #27303 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-06 11:43:30 +02:00
c4cff3d762
Remove Capistrano ( #27295 )
2023-10-06 11:33:43 +02:00
165ec6c779
Remove bundle audit skipping sidekiq CVE ( #27291 )
2023-10-05 21:23:42 +02:00
5606a17933
Update dependency sidekiq to v6.5.10 ( #27287 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 16:35:05 +02:00
2b98e2ecd6
Fix auto-loading-more when not scrolled ( #27286 )
2023-10-05 16:33:54 +02:00
32ab474472
New Crowdin Translations (automated) ( #27277 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-05 13:13:14 +02:00
3c13d70600
Add mention of YJIT in admin dashboard if enabled ( #27283 )
2023-10-05 13:10:17 +02:00
d22515861e
Update dependency @reduxjs/toolkit to v1.9.7 ( #27275 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-05 10:28:47 +02:00
40ba6e119b
Fix Vary headers not being set on some redirects ( #27272 )
2023-10-05 09:50:08 +02:00
8e4251f9e7
New Crowdin Translations (automated) ( #27270 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-04 10:53:04 +02:00
72cec47c13
Silence deprecation warning in CacheBuster spec ( #27264 )
2023-10-04 10:17:36 +02:00
68ec1d180a
Fix language sorting in settings ( #27158 )
2023-10-04 09:23:50 +02:00
c676bc91e9
Dont match mention in url query string ( #25656 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2023-10-03 17:01:45 +02:00
2f8f92df48
Fix Elastic check deprecation warning about gem version ( #27262 )
2023-10-03 15:52:47 +02:00
85db392464
Autofix Rubocop cops for config/ ( #24145 )
2023-10-03 15:24:12 +02:00
e715da6d25
Fix haml-lint Rubocop `Rails/*` cops ( #26042 )
2023-10-03 15:00:40 +02:00
8bb4706e11
Move migration_helpers Rubocop ignore to config ( #24236 )
2023-10-03 14:58:40 +02:00
37bbd3c106
Fix double scroll bars in some columns in advanced interface ( #27187 )
2023-10-03 13:12:39 +02:00
ceb365c419
Fix boosts of local users being filtered in account timelines ( #27204 )
2023-10-03 12:21:42 +02:00
4e55001e65
Add a short-lived lock to trend refresh scheduler ( #27253 )
2023-10-03 12:21:32 +02:00
5a437edc7f
Keep version string displayed without breakpoints in UI ( #26986 )
2023-10-03 11:52:21 +02:00
6320c52630
Change min age of backup policy from 1 week to 6 days ( #27200 )
2023-10-03 11:48:57 +02:00
ad637eacd1
Add a test case for ES8 ( #27248 )
2023-10-03 10:48:32 +02:00
e836d078bb
Update dependency haml_lint to v0.51.0 ( #27250 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-03 10:48:05 +02:00
770fd993ec
Fix importer returning negative row estimates ( #27258 )
2023-10-03 10:47:50 +02:00
e95d25e101
New Crowdin Translations (automated) ( #27260 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-03 10:47:28 +02:00
5e56f3db65
Change some worker lock TTLs ( #27246 )
2023-10-03 10:09:00 +02:00
7e7d6e695b
Fix incorrectly keeping outdated update notices absent from the API endpoint ( #27021 )
2023-10-02 16:42:52 +02:00
1e2d4975cf
Fix import progress not updating on certain failures ( #27247 )
2023-10-02 16:20:04 +02:00
ee866ec0e0
New Crowdin Translations (automated) ( #27220 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2023-10-02 13:35:29 +02:00
f68d540271
Fix websocket connections being incorrectly decremented twice on errors ( #27238 )
2023-10-02 13:21:43 +02:00
5f2d494f0d
Update dependency react-redux to v8.1.3 ( #27229 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2023-10-02 13:18:29 +02:00
Claire