diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-16 16:03:07 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-07-16 16:03:07 +0200 |
| commit | a7fded9b9529cfc08463afd4f6cf12478262e951 (patch) | |
| tree | 69a0acd9145acc15a5f90a9bac07f041ccf62e72 /config | |
| parent | 26f5d6047d6e21a5c65a4276266648f1e69aac4a (diff) | |
| download | gitlab-ce-a7fded9b9529cfc08463afd4f6cf12478262e951.tar.gz | |
Huge refactoring for accepting merge requests
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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 055d59a0c93..704cf705870 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -458,8 +458,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 |