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

Remove dead code from public.jsx (#26547)

New Crowdin translations (#2388)

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

Fix colors and typography on hashtag bar in web UI (#26666)

Add search options to search popout in web UI (#26662)

Update dependency @testing-library/jest-dom to v6 (#26479)

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

New Crowdin translations (#2376)

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

Fix toast saying "published" instead of "saved" after editing post in web UI (#26664)

Add `data-nosnippet` attribute to remote posts and local posts with `noindex` (#26648)

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

Merge upstream changes

[Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode

Port e90649b0641910225e04e308e59297f8c91b96a8 to glitch-soc

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

[Glitch] Fix selecting domains to forward reports to not passing the information correctly

Port b2ac93dd7379933dac63e60ea4260283a2f856f5 to glitch-soc

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

Merge commit '96bcee66fba582666259d1d7785c3a7f2a72b8aa' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed how the nightly builds are versioned, the conflict
  is because glitch-soc modified adjacent lines relative to the docker
  repositories the images are pushed to.
  Applied upstream's changes.
- `app/views/settings/preferences/notifications/show.html.haml`:
  Upstream moved some settings around. Glitch-soc had more settings.
  Applied upstream's changes, moving glitch-soc's extra settings
  accordingly.

[Glitch] Change opacity of the delete icon in the search field to be more visible

Port 9a8190da4a7a5bd74df36ae076573e014b254ef0 to glitch-soc

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