From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 7 Jul 2019 11:49:31 +0000 (+0200)
Subject: Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=7039dca12cf926fecbb2eb4fbba1461af5cb91c2;p=mastodon.git

Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream

Unlike upstream, kept the direct timeline endpoint, as it is still of use in
glitch-soc.
---

7039dca12cf926fecbb2eb4fbba1461af5cb91c2
diff --cc config/routes.rb
index 05bcaf9e2,9ab5ba7f0..62374d0df
--- a/config/routes.rb
+++ b/config/routes.rb
@@@ -359,11 -347,9 +357,10 @@@ Rails.application.routes.draw d
          end
        end
  
 -      resources :notifications, only: [:index, :show] do
 +      resources :notifications, only: [:index, :show, :destroy] do
          collection do
            post :clear
-           post :dismiss # Deprecated
 +          delete :destroy_multiple
          end
  
          member do