diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-11-09 16:18:48 +0200 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-11-09 16:18:48 +0200 |
commit | 327f7ae88c9d33eb0988200c60bbff8178e76c3a (patch) | |
tree | f059c7907eda4f32cb675b9cf391e8a462752875 | |
parent | dbaeb02572d73085bd5175efbc20204ea520be82 (diff) | |
download | gitlab-ce-ce_upstream.tar.gz |
Fix group hooks routing after merge conflictsce_upstream
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-rw-r--r-- | config/routes/group.rb | 12 |
1 files 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 |