diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-02 11:44:58 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-05-02 11:44:58 +0000 |
commit | aaf37ead9252d2c903ebfd8e3fd7914ba6cbd765 (patch) | |
tree | 9b7b4876ea681e78dff02ba62734661dba91803b /config | |
parent | 3efe534255a130f41d1427efd35ea84e39a99297 (diff) | |
parent | c504b88f07f03d381e7b2e22a129413319508413 (diff) | |
download | gitlab-ce-aaf37ead9252d2c903ebfd8e3fd7914ba6cbd765.tar.gz |
Merge branch '19364-webhook-edit' into 'master'
Implement ability to update hooks
Closes #19364
See merge request !10816
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/admin.rb | 6 | ||||
-rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 52ba10604d4..48993420ed9 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -50,8 +50,10 @@ namespace :admin do resources :deploy_keys, only: [:index, :new, :create, :destroy] - resources :hooks, only: [:index, :create, :destroy] do - get :test + resources :hooks, only: [:index, :create, :edit, :update, :destroy] do + member do + get :test + end end resources :broadcast_messages, only: [:index, :edit, :create, :update, :destroy] do diff --git a/config/routes/project.rb b/config/routes/project.rb index 115ae2324b3..71fc84a7a12 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -185,7 +185,7 @@ constraints(ProjectUrlConstrainer.new) do end end - resources :hooks, only: [:index, :create, :destroy], constraints: { id: /\d+/ } do + resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do member do get :test end |