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

2018-08-22 20:56:32 +02:00
parent 628fca50e2 56f882aed6
commit e70fc059a9
103 changed files with 757 additions and 167 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -177,7 +177,7 @@ Rails.application.routes.draw do
      resource :change_email, only: [:show, :update]
      resource :reset, only: [:create]
      resource :silence, only: [:create, :destroy]
-      resource :suspension, only: [:create, :destroy]
+      resource :suspension, only: [:new, :create, :destroy]
      resources :statuses, only: [:index, :create, :update, :destroy]

      resource :confirmation, only: [:create] do