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

2018-10-07 19:47:56 +02:00
parent 7cc7843109 25744d43b0
commit 611740ce81
50 changed files with 1503 additions and 60 deletions
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -307,6 +307,10 @@ Rails.application.routes.draw do
      resources :notifications, only: [:index, :show, :destroy] do
        collection do
          post :clear
+          post :dismiss # Deprecated
+        end
+
+        member do
          post :dismiss
          delete :destroy_multiple
        end