Fix 404 error when visit group label edit pagedz-fix-group-label-404

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 11 insertions, 11 deletions

diff --git a/config/routes/group.rb b/config/routes/group.rb
index 9fe72990994..776c31c9dac 100644
--- a/config/routes/group.rb
+++ b/config/routes/group.rb
@@ -1,15 +1,5 @@
 resources :groups, only: [:index, :new, :create]
 
-scope(path: 'groups/*id',
-      controller: :groups,
-      constraints: { id: Gitlab::Regex.namespace_route_regex }) 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
-end
-
 scope(path: 'groups/*group_id',
       module: :groups,
       as: :group,
@@ -22,10 +12,20 @@ scope(path: 'groups/*group_id',
   resource :avatar, only: [:destroy]
   resources :milestones, constraints: { id: /[^\/]+/ }, only: [:index, :show, :update, :new, :create]
 
-  resources :labels, except: [:show], constraints: { id: /\d+/ } do
+  resources :labels, except: [:show] do
     post :toggle_subscription, on: :member
   end
 end
 
+scope(path: 'groups/*id',
+      controller: :groups,
+      constraints: { id: Gitlab::Regex.namespace_route_regex }) 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
+end
+
 # Must be last route in this file
 get 'groups/*id' => 'groups#show', as: :group_canonical, constraints: { id: Gitlab::Regex.namespace_route_regex }