From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 23 Dec 2018 10:28:28 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=3e686beaea1931c76c778d8ca6b03c41caaf69db;p=mastodon.git

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.
---

3e686beaea1931c76c778d8ca6b03c41caaf69db
diff --cc config/routes.rb
index 918c69cc2,7723a08af..26566dfbc
--- a/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