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

2020-11-07 18:19:34 +01:00
parent 5a9fc749c3 ee8cf246cf
commit 412218af2e
56 changed files with 403 additions and 170 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@ -238,6 +238,7 @@ Rails.application.routes.draw do
    resources :accounts, only: [:index, :show, :destroy] do
      member do
        post :enable
+        post :unsensitive
        post :unsilence
        post :unsuspend
        post :redownload
@ -480,6 +481,7 @@ Rails.application.routes.draw do
        resources :accounts, only: [:index, :show, :destroy] do
          member do
            post :enable
+            post :unsensitive
            post :unsilence
            post :unsuspend
            post :approve