summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2018-09-11 22:46:02 +0200
committerJan Provaznik <jprovaznik@gitlab.com>2018-09-12 20:12:16 +0200
commit55d2953ab1b9e6b64283e89d452f721860e04a4e (patch)
tree7a6be9ed49e58b7f6c909979821efc54f42403ca /config
parent67f3bf3af8a3f178f07fe7f08b3eea59f3db865b (diff)
downloadgitlab-ce-55d2953ab1b9e6b64283e89d452f721860e04a4e.tar.gz
Fix route deprecation warnings in rails 5
Diffstat (limited to 'config')
-rw-r--r--config/routes.rb2
-rw-r--r--config/routes/project.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/routes.rb b/config/routes.rb
index e2e97b46d23..1242bbbf932 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -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
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 4021d62b931..8a5310b5c23 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -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