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

Conflicts:
- config/routes.rb
  Upstream changed some admin routes, conflict was because of an added :show
  action for statuses on our side. Kept it.

diff --cc app/controllers/directories_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/models/account.rb
Simple merge

diff --cc app/models/concerns/account_associations.rb
Simple merge

diff --cc app/views/admin/reports/show.html.haml
Simple merge

diff --cc config/locales/ca.yml
Simple merge

diff --cc config/locales/de.yml
Simple merge

diff --cc config/locales/en.yml
Simple merge

diff --cc config/locales/es.yml
Simple merge

diff --cc config/locales/gl.yml
Simple merge

diff --cc config/locales/ja.yml
Simple merge

diff --cc config/locales/nl.yml
Simple merge

diff --cc config/locales/oc.yml
Simple merge

diff --cc config/locales/pl.yml
Simple merge

diff --cc config/locales/pt-BR.yml
Simple merge

diff --cc config/locales/simple_form.en.yml
Simple merge

diff --cc config/locales/sk.yml
Simple merge

diff --cc config/routes.rb
index 918c69cc26d2bc09467304efebc3bdf6550970dd,7723a08af97a42851976ae1e4393e518138a478e..26566dfbc0be7267d7ef3f4836ba721cc5b1fd33
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -183,9 -189,8 +192,8 @@@ Rails.application.routes.draw d
  
        resource :change_email, only: [:show, :update]
        resource :reset, only: [:create]
-       resource :silence, only: [:create, :destroy]
-       resource :suspension, only: [:new, :create, :destroy]
+       resource :action, only: [:new, :create], controller: 'account_actions'
 -      resources :statuses, only: [:index, :create, :update, :destroy]
 +      resources :statuses, only: [:index, :show, :create, :update, :destroy]
  
        resource :confirmation, only: [:create] do
          collection do

diff --cc db/schema.rb
Simple merge