diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-07-27 19:54:04 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:43 +0300 |
| commit | 14a4b17d1c8a43c77b0459fd543be36838031610 (patch) | |
| tree | d47104567085d3d711976eb299875f5e1aab0d24 /config | |
| parent | a1c79612172ce07c7b0de4c01fba8fa7369c71de (diff) | |
Allow resolving conflicts in MR controller
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 7df9726bc8e..93da084b64a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -728,6 +728,7 @@ Rails.application.routes.draw do post :toggle_award_emoji post :remove_wip get :diff_for_path + post :resolve_conflicts end collection do |