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

Merge upstream changes

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

Fix forgotten unconfirmed_email migration file (#25702)

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

Merge upstream changes

Add users index on unconfirmed_email (#25672)

Add superapp index on `oauth_applications` (#25670)

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

Revert "Rails 7 update" (#25667)

Rails 7 update (#24241)

Add index to backups on `user_id` column (#25647)

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

Merge upstream changes

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

Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.

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

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.

Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.

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

Add time zone preference (#25342)

Fix compatibility of recent migration with PostgreSQL 10 (#25324)

Add webhook templating (#23289)

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

Add exclusive lists (#22048)

Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

Add missing primary keys to `accounts_tags` and `statuses_tags` (#25210)