diff options
author | Felipe Artur <felipefac@gmail.com> | 2018-07-26 18:30:50 -0300 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2018-07-26 18:30:50 -0300 |
commit | 13ea4b387ddcee5f5e8a59ac90dc9e485f4242f5 (patch) | |
tree | ea588d7aecbaa8868f23addf50748a14d167e342 /config | |
parent | caeb4597a5b24e0eaa96b24901ce9208c2eef4bf (diff) | |
parent | 45c94aba1b90dbe86c5583c8782cc3f624249fa1 (diff) | |
download | gitlab-ce-13ea4b387ddcee5f5e8a59ac90dc9e485f4242f5.tar.gz |
Merge remote-tracking branch 'dev/master'
Diffstat (limited to 'config')
-rw-r--r-- | config/routes/admin.rb | 2 | ||||
-rw-r--r-- | config/routes/project.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/routes/admin.rb b/config/routes/admin.rb index ff27ceb50dc..109f00631fb 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -54,7 +54,7 @@ namespace :admin do resources :hooks, only: [:index, :create, :edit, :update, :destroy] do member do - get :test + post :test end resources :hook_logs, only: [:show] do diff --git a/config/routes/project.rb b/config/routes/project.rb index 5057e937941..8e019f8c8bb 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -301,7 +301,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resources :hooks, only: [:index, :create, :edit, :update, :destroy], constraints: { id: /\d+/ } do member do - get :test + post :test end resources :hook_logs, only: [:show] do |