diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 16:40:14 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-05 16:40:14 +0300 |
| commit | 957e849f41d96fa9778fcdd06792d2f0274b29ab (patch) | |
| tree | eb100ece04228262142e6ebfeb1df9b1efb824b2 /config | |
| parent | 6b9dbe9f5a175a8162abf296367f561bab3eea1a (diff) | |
| parent | 1cb8588c662df41a76788759737e5b9ecb2ceba6 (diff) | |
Merge branch 'drop-satellites'
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb index ef052a11bb2..f252a6fcc91 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -459,8 +459,8 @@ Gitlab::Application.routes.draw do member do get :diffs get :commits - post :automerge - get :automerge_check + post :merge + get :merge_check get :ci_status post :toggle_subscription end |