diff options
| author | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-23 09:42:20 +0100 |
|---|---|---|
| committer | Zeger-Jan van de Weg <mail@zjvandeweg.nl> | 2015-11-23 10:11:54 +0100 |
| commit | 8608c6325e19f529f7b43ff881c562d3a0114e1c (patch) | |
| tree | acbc21c6603848b4157a2ec5cac11b279f11a5c6 /config | |
| parent | 53b285c9a8b7eec9ee10906ef519da376347b69e (diff) | |
| download | gitlab-ce-8608c6325e19f529f7b43ff881c562d3a0114e1c.tar.gz | |
Refactor MergeWhenBuildSucceedsService and incorporate feedback
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 49543786686..81f568cfa74 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -570,6 +570,7 @@ Gitlab::Application.routes.draw do member do get :diffs get :commits + get :merge_check post :merge post :cancel_merge_when_build_succeeds get :ci_status |