diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-17 16:10:43 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-17 16:10:43 +0000 |
| commit | 25709853cb934a66d9ca363179b39e3dd8e0c13e (patch) | |
| tree | cb982fa59304aa9346a7f44c335df91413ce2692 /config | |
| parent | 16b1512e2271ceec4c9375ecb861b12d0dc82aaa (diff) | |
| parent | 557a0bf14c79c02c65196ff8f7a2251ecd77073c (diff) | |
| download | gitlab-ce-25709853cb934a66d9ca363179b39e3dd8e0c13e.tar.gz | |
Merge branch '24915_merge_slash_command' into 'master'
Support `/merge` slash command for MRs
Closes #24915
See merge request !7746
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index 26e2dc9e6e7..1fc6ed28c74 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -94,6 +94,7 @@ constraints(ProjectUrlConstrainer.new) do get :pipelines get :merge_check post :merge + get :merge_widget_refresh post :cancel_merge_when_build_succeeds get :ci_status get :ci_environments_status |