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

Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.

[Glitch] Fix search popout including full-text search instructions when full-text search is disabled

Port 6c4c72497a5722870e4432ef41dd4c9ec36a8928 to glitch-soc

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

[Glitch] Allow filter form in profiles directory to wrap

Port f1d250135ccf9be5c4d982a2c48417da89d38eb5 to glitch-soc

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

[Glitch] Add an explanation banner on switching to single column mode

Port 40b69cc1cd62fa57047905a6999985ae6c183f6c to glitch-soc

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

Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.

[Glitch] Fix sign up steps progress layout in right-to-left locales

Port 21ec596dabbe28a5cfc5b29362f46f47b48eb140 to glitch-soc

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

[Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts

Port 74eb7dbf2d79b74f7d6f09ca3d39b3ba67f5f7bf to glitch-soc

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

[Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts

Port ae6cf33321a9f240ef73666a552e552b65390012 to glitch-soc

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

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

Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.

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

[Glitch] Add search options to search popout in web UI

Port bceb8931591b4b9df6e8dcfb47864c230884262c to glitch-soc

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

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

Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.

[Glitch] Add `data-nosnippet` attribute to remote posts and local posts with `noindex`

Port c3a42e1280759ea28bee11f241aef892b148bf6a to glitch-soc

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

Merge commit '072112867b9a3ec090ad2c92d6363b47b2265d74' into glitch-soc/merge-upstream

Add `authorized_fetch` server setting in addition to env var (#25798)

Fix search popout including full-text search instructions when full-text search is disabled (#26755)

Allow filter form in profiles directory to wrap (#26682)

Add an explanation banner on switching to single column mode (#26019)