Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-04-11 00:50:09 +00:00
parent 67e77f230e d9b62e34da
commit 33c2bbdda7
40 changed files with 488 additions and 110 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -160,6 +160,7 @@ Rails.application.routes.draw do
        post :memorialize
      end

+      resource :change_email, only: [:show, :update]
      resource :reset, only: [:create]
      resource :silence, only: [:create, :destroy]
      resource :suspension, only: [:create, :destroy]