Commit 12688984 authored by Grzegorz Bizon's avatar Grzegorz Bizon

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

Fix route deprecation warnings in rails 5

See merge request gitlab-org/gitlab-ce!21684
parents 71f3d485 55d2953a
...@@ -31,7 +31,7 @@ Rails.application.routes.draw do ...@@ -31,7 +31,7 @@ Rails.application.routes.draw do
# Having a non-existent controller here does not affect the scope in any way since all possible routes # Having a non-existent controller here does not affect the scope in any way since all possible routes
# get a 404 proc returned. It is written in this way to minimize merge conflicts with EE # get a 404 proc returned. It is written in this way to minimize merge conflicts with EE
scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do scope path: '/login/oauth', controller: 'oauth/jira/authorizations', as: :oauth_jira do
match ':action', via: [:get, :post], to: proc { [404, {}, ['']] } match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
end end
use_doorkeeper_openid_connect use_doorkeeper_openid_connect
......
...@@ -145,7 +145,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do ...@@ -145,7 +145,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end end
end end
controller 'merge_requests/creations', path: 'merge_requests' do scope path: 'merge_requests', controller: 'merge_requests/creations' do
post '', action: :create, as: nil post '', action: :create, as: nil
scope path: 'new', as: :new_merge_request do scope path: 'new', as: :new_merge_request do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment