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

Merge upstream changes

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`.

Rails 7.0 update (#25668)

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

Merge upstream changes

Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream

Conflicts:
- `db/migrate/20180831171112_create_bookmarks.rb`:
  Upstream ran a lint fix on this file, but this file is different in
  glitch-soc because the feature was added much earlier.
  Ran the lint fix on our own version of the file.

Fix `Style/SlicingWithRange` cop (#25923)

Enable Rubocop Style/FrozenStringLiteralComment (#23793)

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.