diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 11:57:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-05-29 11:57:35 +0300 |
| commit | ac584d6b086691ad6b496c082a80bc78b8f08a22 (patch) | |
| tree | 22cc8fadac796a0fdb0d8ccda0a8ba5af85d24dc /config | |
| parent | d047d299bf77de9bcd30eeb1d5ade217aa63e913 (diff) | |
| parent | c090ebc07e0091076833bae7fa4c729d6977cdd4 (diff) | |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index bf2cb6421c5..3f8f920963d 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -450,6 +450,7 @@ Gitlab::Application.routes.draw do resources :merge_requests, constraints: { id: /\d+/ }, except: [:destroy] do member do get :diffs + get :commits post :automerge get :automerge_check get :ci_status |