diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 22:52:45 +0300 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2017-05-19 22:52:45 +0300 |
| commit | 5460153c9f1a0b1679e4f31f1d588cb77857b714 (patch) | |
| tree | bbee0c9665f835a7834995374b15ab32d86eded9 /config | |
| parent | db4bbbabcafa78cfa0176fefac1b4c1dd33d098f (diff) | |
| parent | b3cf3d046b8a319c0dbca7cb9aeaea027c080e6f (diff) | |
Merge branch '32536-mr-widget-performance-improvements' into 'master'
Load improvements related to MR widget
See merge request !11518
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index c786cbdee1e..01b94f9f2b8 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -74,7 +74,6 @@ constraints(ProjectUrlConstrainer.new) do get :conflicts get :conflict_for_path get :pipelines - get :merge_check get :commit_change_content post :merge post :cancel_merge_when_pipeline_succeeds |