diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-17 12:21:30 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2016-08-17 15:13:52 -0500 |
| commit | 45cd11010dc9f63656640aa5d740748266fcf8ea (patch) | |
| tree | a797a575220971fbe44945fdfbffaf1960c9911a /config | |
| parent | 1010284798d265cd11a2912da176bf78eee60004 (diff) | |
| download | gitlab-ce-45cd11010dc9f63656640aa5d740748266fcf8ea.tar.gz | |
Merge branch 'mc-ui'
# Conflicts:
# app/controllers/projects/merge_requests_controller.rb
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/routes.rb b/config/routes.rb index f2c51706e25..a62c460f055 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -722,6 +722,7 @@ Rails.application.routes.draw do member do get :commits get :diffs + get :conflicts get :builds get :pipelines get :merge_check @@ -732,6 +733,7 @@ Rails.application.routes.draw do post :toggle_award_emoji post :remove_wip get :diff_for_path + post :resolve_conflicts end collection do |