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.
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.
Keep version string displayed without breakpoints in UI (#26986)
Change min age of backup policy from 1 week to 6 days (#27200)
Add a test case for ES8 (#27248)
Update dependency haml_lint to v0.51.0 (#27250)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Fix importer returning negative row estimates (#27258)
New Crowdin Translations (automated) (#27260)
Co-authored-by: GitHub Actions <noreply@github.com>
Change some worker lock TTLs (#27246)
Fix incorrectly keeping outdated update notices absent from the API endpoint (#27021)
Fix import progress not updating on certain failures (#27247)
New Crowdin Translations (automated) (#27220)
Co-authored-by: GitHub Actions <noreply@github.com>
Fix websocket connections being incorrectly decremented twice on errors (#27238)
Update dependency react-redux to v8.1.3 (#27229)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>