diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-17 12:21:30 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-17 12:21:30 -0500 |
| commit | 095fcfc4473d7bfbca878bc2947ca8dfc59e387f (patch) | |
| tree | 270d8e397840c677a327823bf3c9fddff1dcc7aa /config | |
| parent | eefb2582f45d9946de4a4b78cf8bcdc86085a1e0 (diff) | |
| parent | b37c7a3a8e15e8dde2362041816cea186c8a7cfb (diff) | |
| download | gitlab-ce-095fcfc4473d7bfbca878bc2947ca8dfc59e387f.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 b57d42ee846..58e824c0476 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -727,6 +727,7 @@ Rails.application.routes.draw do member do get :commits get :diffs + get :conflicts get :builds get :pipelines get :merge_check @@ -737,6 +738,7 @@ Rails.application.routes.draw do post :toggle_award_emoji post :remove_wip get :diff_for_path + post :resolve_conflicts end collection do |