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

Merge upstream changes up to 4c2aca777f6ae6942d0cf11aee56a925694ccdef

[Glitch] Fix clicking on already-loaded thread scrolling to the top of the thread

Port 4c2aca777f6ae6942d0cf11aee56a925694ccdef to glitch-soc

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

Merge commit '4c2aca777f6ae6942d0cf11aee56a925694ccdef' into glitch-soc/merge-upstream

[Glitch] Autofix missing comma and indentation in JS files

Port 774e1189d26fffd914107a4236f6287043c988f8 to glitch-soc

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

Merge commit '774e1189d26fffd914107a4236f6287043c988f8' into glitch-soc/merge-upstream

[Glitch] Fix clicking on already-opened thread post scrolling to the top of the thread

Port c310374a2f83a890520ace50e41c1e3d046e15e1 to glitch-soc

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

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

Fix clicking on already-loaded thread scrolling to the top of the thread (#27338)

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

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f

Change `eslint` config to autofix missing comma and indentation in JS files (#26711)

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>

[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 '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