Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 1 deletions

diff --git a/config/routes/project.rb b/config/routes/project.rb
index 14caae35a83..953ddfc4165 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -239,8 +239,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      resources :merge_requests, concerns: :awardable, except: [:new, :create], constraints: { id: /\d+/ } do
+      resources :merge_requests, concerns: :awardable, except: [:new, :create, :show], constraints: { id: /\d+/ } do
         member do
+          get :show # Insert this first to ensure redirections using merge_requests#show match this route
           get :commit_change_content
           post :merge
           post :cancel_auto_merge