diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-02 17:27:38 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-02 17:27:38 +0100 |
| commit | 77f8a1e392b64f51326df8aebdc77e97af07bfed (patch) | |
| tree | f1ce42885c2459c9e4737d8a8b5099fbdc2efa7b /config | |
| parent | 8c9e1df98eb45e3305ab5badc6727580e84d36e0 (diff) | |
| download | gitlab-ce-77f8a1e392b64f51326df8aebdc77e97af07bfed.tar.gz | |
Merge when build succeeds
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 0458f538eb6..917c3d3f1ed 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -556,6 +556,7 @@ Gitlab::Application.routes.draw do get :diffs get :commits post :merge + delete :merge, action: :cancel_merge_when_build_succeeds get :merge_check get :ci_status post :toggle_subscription |