Commit 327f7ae8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix group hooks routing after merge conflicts

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent dbaeb025
...@@ -47,15 +47,15 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do ...@@ -47,15 +47,15 @@ scope(path: 'groups/:group_id', module: :groups, as: :group) do
resource :notification_setting, only: [:update] resource :notification_setting, only: [:update]
resources :audit_events, only: [:index] resources :audit_events, only: [:index]
## EE-specific ## EE-specific
end
## EE-specific ## EE-specific
resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ }, module: :groups do resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do
member do member do
get :test get :test
end
end end
## EE-specific
end end
## EE-specific
# Must be last route in this file # Must be last route in this file
get 'groups/:id' => 'groups#show', as: :group_canonical get 'groups/:id' => 'groups#show', as: :group_canonical
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment