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

Merge upstream changes up to 496eb6f7a4fa7de54f26da9642a76e6884648102

Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.

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

Merge upstream up to 425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa

Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream

Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
- `README.md`:
  Upstream updated its README, but glitch-soc has a completely different one.
  Kept glitch-soc's README

Update dependency regenerator-runtime to ^0.14.0 (#26432)

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

Update dependency eslint-config-prettier to v9 (#26434)

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

Update eslint (non-major) (#26323)

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

Change streaming `/metrics` to include additional metrics (#26299)

Change design of role badges in web UI (#26281)

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

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

Merge upstream changes

Merge commit '71db616fed817893d0efa363f0e7dbfcf23866a0' into glitch-soc/merge-upstream

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

Merge upstream changes

Change links in multi-column mode so tabs are open in single-column mode (#25893)

Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream

Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/fonts/roboto-mono.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.
- `app/javascript/styles/fonts/roboto.scss`:
  Upstream updated the linter, which changed a few linter rules.
  Some of those changed lines are different in glitch-soc because we use
  different paths for the assets.
  Applied the same style rules on our version of the file.

Merge commit '0d7340380cf3094335d8bc67f7c465e2b154566a' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/application_controller.rb:
  Upstream added an `include` where we had an extra `include` due to
  glitch-soc's theming system.
  Added upstream's new `include`.

Upgrade to `typescript-eslint` v6 (#25904)

Upgrade to Prettier 3 (#25902)

Rails 7.0 update (#25668)

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

Merge upstream changes