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

Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.

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/javascript/styles/mastodon/components.scss
Simple merge

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

diff --cc app/views/admin/domain_blocks/edit.html.haml
Simple merge

diff --cc app/views/admin/domain_blocks/new.html.haml
Simple merge

diff --cc app/views/admin/settings/edit.html.haml
Simple merge

diff --cc db/schema.rb
Simple merge

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