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

Upgrade JS dev dependencies (#26442)

Update dependency pg-connection-string to v2.6.2 (#26427)

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

Update dependency eslint-import-resolver-typescript to v3.6.0 (#26429)

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

Update babel monorepo to v7.22.10 (#26421)

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

Update dependency pg to v8.11.2 (#26426)

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

Update dependency @rails/ujs to v7.0.7 (#26422)

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

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

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

Update dependency sass to v1.65.1 (#26433)

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 dependency immutable to v4.3.2 (#26425)

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>

Update dependency sass to v1.64.2 (#26315)

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

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

Update dependency core-js to v3.32.0 (#26317)

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

Update dependency react-redux to v8.1.2 (#26314)

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

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

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