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
341d2f00
Commit
341d2f00
authored
Sep 03, 2017
by
Oswaldo Ferreira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Handle /-/jira prefix when Jira links projects and commits
parent
a6b1f018
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
4 deletions
+15
-4
config/routes/project.rb
config/routes/project.rb
+15
-4
No files found.
config/routes/project.rb
View file @
341d2f00
...
@@ -18,6 +18,7 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -18,6 +18,7 @@ constraints(ProjectUrlConstrainer.new) do
# `:project_id`, or `*id`.
# `:project_id`, or `*id`.
#
#
# See https://github.com/rails/rails/blob/v4.2.8/actionpack/lib/action_dispatch/routing/mapper.rb#L155
# See https://github.com/rails/rails/blob/v4.2.8/actionpack/lib/action_dispatch/routing/mapper.rb#L155
scope
(
path:
'*namespace_id'
,
scope
(
path:
'*namespace_id'
,
as: :namespace
,
as: :namespace
,
namespace_id:
Gitlab
::
PathRegex
.
full_namespace_route_regex
)
do
namespace_id:
Gitlab
::
PathRegex
.
full_namespace_route_regex
)
do
...
@@ -262,8 +263,8 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -262,8 +263,8 @@ constraints(ProjectUrlConstrainer.new) do
resources
:artifacts
,
only:
[]
do
resources
:artifacts
,
only:
[]
do
collection
do
collection
do
get
:latest_succeeded
,
get
:latest_succeeded
,
path:
'*ref_name_and_path'
,
path:
'*ref_name_and_path'
,
format:
false
format:
false
end
end
end
end
end
end
...
@@ -303,12 +304,12 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -303,12 +304,12 @@ constraints(ProjectUrlConstrainer.new) do
end
end
resources
:container_registry
,
only:
[
:index
,
:destroy
],
resources
:container_registry
,
only:
[
:index
,
:destroy
],
controller:
'registry/repositories'
controller:
'registry/repositories'
namespace
:registry
do
namespace
:registry
do
resources
:repository
,
only:
[]
do
resources
:repository
,
only:
[]
do
resources
:tags
,
only:
[
:destroy
],
resources
:tags
,
only:
[
:destroy
],
constraints:
{
id:
Gitlab
::
Regex
.
container_registry_tag_regex
}
constraints:
{
id:
Gitlab
::
Regex
.
container_registry_tag_regex
}
end
end
end
end
...
@@ -476,4 +477,14 @@ constraints(ProjectUrlConstrainer.new) do
...
@@ -476,4 +477,14 @@ constraints(ProjectUrlConstrainer.new) do
end
end
end
end
end
end
scope
path:
'/-/jira'
,
as: :jira
do
scope
path:
'*namespace_id'
,
namespace_id:
Gitlab
::
PathRegex
.
full_namespace_route_regex
do
resources
:projects
,
path:
'/'
,
constraints:
{
id:
Gitlab
::
PathRegex
.
project_route_regex
},
only: :show
scope
path:
':project_id'
,
constraints:
{
project_id:
Gitlab
::
PathRegex
.
project_route_regex
},
module: :projects
do
resources
:commit
,
only: :show
,
constraints:
{
id:
/\h{7,40}/
}
end
end
end
end
end
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