Merge commit '1cdcd9dc08c91321f80ffe4822f6a3da15abeb2c' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.

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

Merge upstream changes up to 1cb978bcc3d291a045f367e072ca0af1a1c4dbbc

Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream

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

Merge upstream changes up to 3a8370e1f459f5cf9695a610102ae6e53df36714

Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream

Update eslint (non-major) (#26567)

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

Update dependency core-js to v3.32.1 (#26548)

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

Update dependency @material-design-icons/svg to v0.14.11 (#26536)

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

Update dependency pg to v8.11.3 (#26519)

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

Update dependency postcss to v8.4.28 (#26502)

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

Update dependency autoprefixer to v10.4.15 (#26473)

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

Upgrade `@types/react` (#26457)

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>