Apply GroupUrlConstrainer to all routes with group IDs

config/routes/group.rb

@@ -2,87 +2,87 @@ require 'constraints/group_url_constrainer'
 
 resources :groups, only: [:index, :new, :create]
 
-scope(path: 'groups/*id',
-      controller: :groups,
-      constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
-  get :edit, as: :edit_group
-  get :issues, as: :issues_group
-  get :merge_requests, as: :merge_requests_group
-  get :projects, as: :projects_group
-  get :activity, as: :activity_group
-  get :subgroups, as: :subgroups_group
-  get '/', action: :show, as: :group_canonical
-end
+constraints(GroupUrlConstrainer.new) do
+  scope(path: 'groups/*id',
+        controller: :groups,
+        constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ }) do
+    get :edit, as: :edit_group
+    get :issues, as: :issues_group
+    get :merge_requests, as: :merge_requests_group
+    get :projects, as: :projects_group
+    get :activity, as: :activity_group
+    get :subgroups, as: :subgroups_group
+    get '/', action: :show, as: :group_canonical
+  end
 
-scope(path: 'groups/*group_id',
-      module: :groups,
-      as: :group,
-      constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
+  scope(path: 'groups/*group_id',
+        module: :groups,
+        as: :group,
+        constraints: { group_id: Gitlab::PathRegex.full_namespace_route_regex }) do
 
-  ## EE-specific
-  resource :analytics, only: [:show]
-  resource :ldap, only: [] do
-    member do
-      put :sync
+    ## EE-specific
+    resource :analytics, only: [:show]
+    resource :ldap, only: [] do
+      member do
+        put :sync
+      end
     end
-  end
 
-  resources :ldap_group_links, only: [:index, :create, :destroy]
-  ## EE-specific
+    resources :ldap_group_links, only: [:index, :create, :destroy]
+    ## EE-specific
+
+    resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
+      post :resend_invite, on: :member
+      delete :leave, on: :collection
+
+      ## EE-specific
+      patch :override, on: :member
+      ## EE-specific
+    end
 
-  resources :group_members, only: [:index, :create, :update, :destroy], concerns: :access_requestable do
-    post :resend_invite, on: :member
-    delete :leave, on: :collection
+    resource :avatar, only: [:destroy]
+    resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
+      member do
+        get :merge_requests
+        get :participants
+        get :labels
+      end
+    end
 
     ## EE-specific
-    patch :override, on: :member
+    resource :notification_setting, only: [:update]
+    resources :audit_events, only: [:index]
+    resources :pipeline_quota, only: [:index]
     ## EE-specific
-  end
 
-  resource :avatar, only: [:destroy]
-  resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :edit, :update, :new, :create] do
-    member do
-      get :merge_requests
-      get :participants
-      get :labels
+    ## EE-specific
+    resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
+      member do
+        get :test
+      end
     end
-  end
-
-  ## EE-specific
-  resource :notification_setting, only: [:update]
-  resources :audit_events, only: [:index]
-  resources :pipeline_quota, only: [:index]
-  ## EE-specific
+    ## EE-specific
 
-  ## EE-specific
-  resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
-    member do
-      get :test
+    resources :labels, except: [:show] do
+      post :toggle_subscription, on: :member
     end
-  end
-  ## EE-specific
 
-  resources :labels, except: [:show] do
-    post :toggle_subscription, on: :member
-  end
+    scope path: '-' do
+      namespace :settings do
+        resource :ci_cd, only: [:show], controller: 'ci_cd'
+      end
 
-  scope path: '-' do
-    namespace :settings do
-      resource :ci_cd, only: [:show], controller: 'ci_cd'
-    end
+      resources :variables, only: [:index, :show, :update, :create, :destroy]
+      resources :billings, only: [:index]
 
-    resources :variables, only: [:index, :show, :update, :create, :destroy]
-    resources :billings, only: [:index]
+      ## EE-specific
+      resources :boards, only: [:index, :show, :create, :update, :destroy]
+    end
 
     ## EE-specific
-    resources :boards, only: [:index, :show, :create, :update, :destroy]
-  end
-
-  ## EE-specific
-  get :boards, to: redirect('/groups/%{group_id}/-/boards')
+    get :boards, to: redirect('/groups/%{group_id}/-/boards')
 end
 
-constraints(GroupUrlConstrainer.new) do
   scope(path: '*id',
         as: :group,
         constraints: { id: Gitlab::PathRegex.full_namespace_route_regex, format: /(html|json|atom)/ },