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.
Update eslint (non-major) to v6.7.3 (#27213)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update libretranslate/libretranslate Docker tag to v1.3.12 (#27214)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update DefinitelyTyped types (non-major) (#27212)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
New Crowdin Translations (automated) (#27202)
Co-authored-by: GitHub Actions <noreply@github.com>
Update dependency postcss to v8.4.31 (#27199)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Update dependency node to 20.8 (#27201)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Simplify instance presenter view access (#26046)
Fix deprecation warning about `rewhere: true` being default behavior (Rails 7.1 prep) (#27190)
Fix include `Rails.application.routes.url_helpers` (Rails 7.1 prep) (#27189)
Fix haml-lint `InstanceVariables` rule for admin/roles/_form (#26063)
Update dependency rubocop to v1.56.4 (#27188)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Fix haml-lint `InstanceVariables` rule for admin/webhooks/_form (#26062)
Extract filename and csv helper methods from `Form::Import` (#26129)
Extract methods for file movement in `CLI::Upgrade` (#25120)
Fix rubocop `Layout/ArgumentAlignment` cop (#26060)
Fix haml-lint `InstanceVariables` rule for invites/_form (#26064)