Merge commit '93d051e47d27b5bd10be922a81d4d4eb6c306330' into glitch-soc/merge-upstream

Fix Version metadata have trailing dot (#2403)

Do not truncate backtrace when the `BACKTRACE` env variable is set (#26794)

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

Merge upstream changes

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

Bump version to v4.2.0-beta3 (#26753)

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

Fix language settings for users having selected the `kmr` language (#26787)

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

Merge upstream changes into glitch-soc

Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream

Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' 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.

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

Add admin notifications for new Mastodon versions (#26582)

Change video compression parameters (#26631)

Change the pre-release versioning scheme and associated environment variables (#26653)

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

Merge upstream changes

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.

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

Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.

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

Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.