diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-07-27 16:58:14 -0700 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-07-27 16:58:14 -0700 |
| commit | a91ba2287ce7adebb5e0eb33f4335d4ce5f054ed (patch) | |
| tree | 46343419e74ea762869225b982850ac97ed67ea4 /config/routes | |
| parent | 57d1b60f61a790c034b8d43ce2358371464d2d67 (diff) | |
| parent | 35ce06add8ee414e2694017126f12d47e9c9bf27 (diff) | |
| download | gitlab-ce-a91ba2287ce7adebb5e0eb33f4335d4ce5f054ed.tar.gz | |
Merge branch 'master' into sh-support-bitbucket-server-import
Diffstat (limited to 'config/routes')
| -rw-r--r-- | config/routes/admin.rb | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 2 | ||||
| -rw-r--r-- | config/routes/repository.rb | 1 |
3 files changed, 3 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 diff --git a/config/routes/repository.rb b/config/routes/repository.rb index e2bf8d6a7ff..d439cb9acbd 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -83,6 +83,7 @@ scope format: false do get '/raw/*id', to: 'raw#show', as: :raw get '/blame/*id', to: 'blame#show', as: :blame + get '/commits', to: 'commits#commits_root', as: :commits_root get '/commits/*id/signatures', to: 'commits#signatures', as: :signatures get '/commits/*id', to: 'commits#show', as: :commits |