diff options
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 |