From 327f7ae88c9d33eb0988200c60bbff8178e76c3a Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 9 Nov 2016 16:18:48 +0200 Subject: Fix group hooks routing after merge conflicts Signed-off-by: Dmitriy Zaporozhets --- config/routes/group.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/routes/group.rb b/config/routes/group.rb index ba43fbcb243..5ceb861077c 100644 --- a/config/routes/group.rb +++ b/config/routes/group.rb @@ -47,15 +47,15 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do resource :notification_setting, only: [:update] resources :audit_events, only: [:index] ## EE-specific -end -## EE-specific -resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ }, module: :groups do - member do - get :test + ## EE-specific + resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do + member do + get :test + end end + ## EE-specific end -## EE-specific # Must be last route in this file get 'groups/:id' => 'groups#show', as: :group_canonical -- cgit v1.2.1