diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-11 19:16:42 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:41 +0300 |
| commit | 907317c457754db691a88a77845121ac517917d5 (patch) | |
| tree | 23e2a3214ceaa38a0a532911bb8504263f6b5ab5 /config | |
| parent | 1db31dbe4660ed893f1bf4eb2545b1c52ef0725b (diff) | |
| download | gitlab-ce-907317c457754db691a88a77845121ac517917d5.tar.gz | |
Added routes for conflicts in merge requests page.
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 9a98fab15a3..7df9726bc8e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -718,6 +718,7 @@ Rails.application.routes.draw do member do get :commits get :diffs + get :conflicts get :builds get :merge_check post :merge |