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

Merge upstream changes up to 640421f661ee4d7e76a2aab607e7b15687940b6f

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

Fix incorrect serialization of regional languages in `contentMap` (#27207)

Fix crash when filtering for “dormant” relationships (#27306)

Fix Vary headers not being set on some redirects (#27272)

Silence deprecation warning in CacheBuster spec (#27264)

Fix language sorting in settings (#27158)

Dont match mention in url query string (#25656)

Co-authored-by: Claire <claire.github-309c@sitedethib.com>

Fix boosts of local users being filtered in account timelines (#27204)

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

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.

Add `hide_collections`, `discoverable` and `indexable` attributes to credentials API (#26998)

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

Merge upstream changes

Merge branch 'main' into glitch-soc/merge-upstream

Merge pull request from GHSA-hcqf-fw2r-52g4

* Revert "Fix request URL normalisation for bare domain and 8-bit characters (#26285)"

This reverts commit 8891d8945d837f0da16a3a5aa2dc9783e39b0acd.

* Revert "Do not normalize URL before fetching it (#26219)"

This reverts commit fd284311e79854d6bc2901a9d9363ba9e7e00513.

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

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df

Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.