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
8e42fe94
Commit
8e42fe94
authored
Jun 25, 2019
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Delineate additional EE-only routes
parent
2d738b6f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
16 deletions
+29
-16
config/routes.rb
config/routes.rb
+19
-8
config/routes/project.rb
config/routes/project.rb
+10
-8
No files found.
config/routes.rb
View file @
8e42fe94
...
@@ -30,9 +30,12 @@ Rails.application.routes.draw do
...
@@ -30,9 +30,12 @@ Rails.application.routes.draw do
# This prefixless path is required because Jira gets confused if we set it up with a path
# This prefixless path is required because Jira gets confused if we set it up with a path
# More information: https://gitlab.com/gitlab-org/gitlab-ee/issues/6752
# More information: https://gitlab.com/gitlab-org/gitlab-ee/issues/6752
scope
path:
'/login/oauth'
,
controller:
'oauth/jira/authorizations'
,
as: :oauth_jira
do
scope
path:
'/login/oauth'
,
controller:
'oauth/jira/authorizations'
,
as: :oauth_jira
do
get
:authorize
,
action: :new
Gitlab
.
ee
do
get
:callback
get
:authorize
,
action: :new
post
:access_token
get
:callback
post
:access_token
end
# This helps minimize merge conflicts with CE for this scope block
# This helps minimize merge conflicts with CE for this scope block
match
'*all'
,
via:
[
:get
,
:post
],
to:
proc
{
[
404
,
{},
[
''
]]
}
match
'*all'
,
via:
[
:get
,
:post
],
to:
proc
{
[
404
,
{},
[
''
]]
}
end
end
...
@@ -46,9 +49,12 @@ Rails.application.routes.draw do
...
@@ -46,9 +49,12 @@ Rails.application.routes.draw do
get
'/autocomplete/users/:id'
=>
'autocomplete#user'
get
'/autocomplete/users/:id'
=>
'autocomplete#user'
get
'/autocomplete/projects'
=>
'autocomplete#projects'
get
'/autocomplete/projects'
=>
'autocomplete#projects'
get
'/autocomplete/award_emojis'
=>
'autocomplete#award_emojis'
get
'/autocomplete/award_emojis'
=>
'autocomplete#award_emojis'
get
'/autocomplete/project_groups'
=>
'autocomplete#project_groups'
get
'/autocomplete/merge_request_target_branches'
=>
'autocomplete#merge_request_target_branches'
get
'/autocomplete/merge_request_target_branches'
=>
'autocomplete#merge_request_target_branches'
Gitlab
.
ee
do
get
'/autocomplete/project_groups'
=>
'autocomplete#project_groups'
end
# Search
# Search
get
'search'
=>
'search#show'
get
'search'
=>
'search#show'
get
'search/autocomplete'
=>
'search#autocomplete'
,
as: :search_autocomplete
get
'search/autocomplete'
=>
'search#autocomplete'
,
as: :search_autocomplete
...
@@ -78,8 +84,10 @@ Rails.application.routes.draw do
...
@@ -78,8 +84,10 @@ Rails.application.routes.draw do
resources
:issues
,
module: :boards
,
only:
[
:index
,
:update
]
resources
:issues
,
module: :boards
,
only:
[
:index
,
:update
]
resources
:users
,
module: :boards
,
only:
[
:index
]
Gitlab
.
ee
do
resources
:milestones
,
module: :boards
,
only:
[
:index
]
resources
:users
,
module: :boards
,
only:
[
:index
]
resources
:milestones
,
module: :boards
,
only:
[
:index
]
end
end
end
get
'acme-challenge/'
=>
'acme_challenges#show'
get
'acme-challenge/'
=>
'acme_challenges#show'
...
@@ -92,8 +100,11 @@ Rails.application.routes.draw do
...
@@ -92,8 +100,11 @@ Rails.application.routes.draw do
draw
:operations
draw
:operations
draw
:instance_statistics
draw
:instance_statistics
draw
:smartcard
draw
:jira_connect
Gitlab
.
ee
do
draw
:smartcard
draw
:jira_connect
end
if
ENV
[
'GITLAB_ENABLE_CHAOS_ENDPOINTS'
]
if
ENV
[
'GITLAB_ENABLE_CHAOS_ENDPOINTS'
]
get
'/chaos/leakmem'
=>
'chaos#leakmem'
get
'/chaos/leakmem'
=>
'chaos#leakmem'
...
...
config/routes/project.rb
View file @
8e42fe94
...
@@ -210,8 +210,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
...
@@ -210,8 +210,11 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
namespace
:prometheus
do
namespace
:prometheus
do
resources
:metrics
,
constraints:
{
id:
%r{[^
\/
]+}
},
only:
[
:index
,
:new
,
:create
,
:edit
,
:update
,
:destroy
]
do
resources
:metrics
,
constraints:
{
id:
%r{[^
\/
]+}
},
only:
[
:index
,
:new
,
:create
,
:edit
,
:update
,
:destroy
]
do
post
:validate_query
,
on: :collection
get
:active_common
,
on: :collection
get
:active_common
,
on: :collection
Gitlab
.
ee
do
post
:validate_query
,
on: :collection
end
end
end
Gitlab
.
ee
do
Gitlab
.
ee
do
...
@@ -359,13 +362,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
...
@@ -359,13 +362,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
get
:builds
get
:builds
get
:failures
get
:failures
get
:status
get
:status
get
:security
get
:licenses
end
member
do
Gitlab
.
ee
do
resources
:stages
,
only:
[],
param: :name
do
get
:security
post
:play_manual
get
:licenses
end
end
end
end
...
@@ -508,7 +508,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
...
@@ -508,7 +508,9 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
end
end
end
end
resources
:issue_links
,
only:
[
:index
,
:create
,
:destroy
],
as:
'links'
,
path:
'links'
Gitlab
.
ee
do
resources
:issue_links
,
only:
[
:index
,
:create
,
:destroy
],
as:
'links'
,
path:
'links'
end
end
end
resources
:notes
,
only:
[
:create
,
:destroy
,
:update
],
concerns: :awardable
,
constraints:
{
id:
/\d+/
}
do
resources
:notes
,
only:
[
:create
,
:destroy
,
:update
],
concerns: :awardable
,
constraints:
{
id:
/\d+/
}
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