Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream

config/routes/api.rb

@@ -301,21 +301,6 @@ namespace :api, format: false do
     end
   end
 
-  concern :grouped_notifications do
-    resources :notifications, param: :group_key, only: [:index, :show] do
-      collection do
-        post :clear
-        get :unread_count
-      end
-
-      member do
-        post :dismiss
-      end
-
-      resources :accounts, only: [:index], module: :notifications
-    end
-  end
-
   namespace :v2 do
     get '/search', to: 'search#index', as: :search
 
@@ -342,11 +327,18 @@ namespace :api, format: false do
       resource :policy, only: [:show, :update]
     end
 
-    concerns :grouped_notifications
-  end
+    resources :notifications, param: :group_key, only: [:index, :show] do
+      collection do
+        post :clear
+        get :unread_count
+      end
 
-  namespace :v2_alpha, module: 'v2' do
-    concerns :grouped_notifications
+      member do
+        post :dismiss
+      end
+
+      resources :accounts, only: [:index], module: :notifications
+    end
   end
 
   namespace :web do