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

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

diff --cc app/controllers/api/v1/statuses_controller.rb
Simple merge

diff --cc app/javascript/mastodon/features/compose/components/compose_form.js
Simple merge

diff --cc config/routes.rb
index 05bcaf9e237f2d55294fa5791075c05185ca2602,9ab5ba7f07db9aec539e86dd2fcb4d495d3265be..62374d0dfd16db424e46c58552139e71a6aa0dbc
--- 1/config/routes.rb
--- 2/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