Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream

Merge pull request #2434 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f

Fix clicking on already-opened thread post scrolling to the top of the thread (#27331)

New Crowdin Translations (automated) (#27321)

Co-authored-by: GitHub Actions <noreply@github.com>

Update DefinitelyTyped types (non-major) (#27327)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update eslint (non-major) (#27328)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

[Glitch] Fix auto-loading-more when not scrolled

Port 2b98e2ecd6224ad41d38f5febd31efa7e4de316d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream

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.

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.

Merge commit '37bbd3c1064380a756b4e821655d7697105f99f5' into glitch-soc/merge-upstream

[Glitch] Keep version string displayed without breakpoints in UI

Port 5a437edc7f22d5797e5af29d9b450a03eccec304 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream

[Glitch] Fix explore prompt appearing because of posts being received out of order

Port d80a819fc60b530042784cc3f20cd3041ee0a996 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream

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.

[Glitch] Fix retention dashboard not displaying correct month

Port 7fddeca1907493fb327316c5447740922acb934f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream

Add 4.2.x to supported versions in SECURITY.md (#27317)