Fix route deprecation warnings in rails 5
This commit is contained in:
parent
67f3bf3af8
commit
55d2953ab1
|
@ -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
|
||||
# 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
|
||||
match ':action', via: [:get, :post], to: proc { [404, {}, ['']] }
|
||||
match '*all', via: [:get, :post], to: proc { [404, {}, ['']] }
|
||||
end
|
||||
|
||||
use_doorkeeper_openid_connect
|
||||
|
|
|
@ -145,7 +145,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
|
||||
|
|
Loading…
Reference in New Issue