Merge branch 'rails5-route-warnings-ee' into 'master'

[EE] Fix route deprecation warnings in rails 5

See merge request gitlab-org/gitlab-ee!7339

config/routes.rb

@@ -34,7 +34,7 @@ Rails.application.routes.draw do
     get :callback
     post :access_token
     # This helps minimize merge conflicts with CE for this scope block
-    match ':action', via: [:get, :post], to: proc { [404, {}, ['']] }
+    match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
   end
 
   namespace :oauth do

config/routes/project.rb

@@ -166,7 +166,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
         end
       end
 
-      controller 'merge_requests/creations', path: 'merge_requests' do
+      scope path: 'merge_requests', controller: 'merge_requests/creations' do
         post '', action: :create, as: nil
 
         scope path: 'new', as: :new_merge_request do