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

Conflicts:
- `README.md`:
  Upstream added some text, but our README is completely different.
  Kept our README unchanged.

diff --cc app/controllers/auth/sessions_controller.rb
Simple merge

diff --cc app/javascript/mastodon/actions/compose.js
Simple merge

diff --cc app/models/account.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc config/environments/production.rb
Simple merge

diff --cc db/schema.rb
Simple merge