Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
55d2953a
Commit
55d2953a
authored
Sep 11, 2018
by
Jan Provaznik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix route deprecation warnings in rails 5
parent
67f3bf3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
config/routes.rb
config/routes.rb
+1
-1
config/routes/project.rb
config/routes/project.rb
+1
-1
No files found.
config/routes.rb
View file @
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
...
...
config/routes/project.rb
View file @
55d2953a
...
@@ -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_request
s'
do
scope
path:
'merge_requests'
,
controller:
'merge_requests/creation
s'
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment