Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream

Conflicts:
- `config/routes/api.rb`:
  glitch-soc has an extra `:destroy` action on notifications for historical reasons.
  Kept it for now, while otherwise updating as upstream did.

config/routes/api.rb

@@ -151,6 +151,17 @@ namespace :api, format: false do
       end
     end
 
+    namespace :notifications do
+      resources :requests, only: [:index, :show] do
+        member do
+          post :accept
+          post :dismiss
+        end
+      end
+
+      resource :policy, only: [:show, :update]
+    end
+
     resources :notifications, only: [:index, :show, :destroy] do
       collection do
         post :clear