Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
Upstream regenerated the schema file using Rails 7, the conflicts are
caused by our extra columns.
Applied upstream's changes, but keeping our extra columns.
Use heredoc SQL blocks in `AddFromAccountIdToNotifications` migration (#26178)
Add `published_at` attribute to preview cards (#26153)
Use valid email address for first account (#26114)
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