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

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.

diff --cc .env.production.sample
Simple merge

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

diff --cc app/controllers/tags_controller.rb
Simple merge

diff --cc app/javascript/mastodon/locales/defaultMessages.json
Simple merge

diff --cc app/javascript/mastodon/locales/en.json
Simple merge

diff --cc app/javascript/mastodon/locales/ja.json
Simple merge

diff --cc app/javascript/mastodon/locales/pl.json
Simple merge

diff --cc app/lib/settings/scoped_settings.rb
Simple merge

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

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

diff --cc config/routes.rb
Simple merge

diff --cc lib/mastodon/version.rb
Simple merge