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
d32f3e55
Commit
d32f3e55
authored
Apr 14, 2020
by
Thong Kuah
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix regression with sse route clobbering projects
All new project routes should only be under the `/-/` namespace.
parent
b9997292
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
config/routes/project.rb
config/routes/project.rb
+4
-0
config/routes/repository.rb
config/routes/repository.rb
+0
-4
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+0
-1
No files found.
config/routes/project.rb
View file @
d32f3e55
...
@@ -26,6 +26,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
...
@@ -26,6 +26,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do
scope
'-'
do
scope
'-'
do
get
'archive/*id'
,
constraints:
{
format:
Gitlab
::
PathRegex
.
archive_formats_regex
,
id:
/.+?/
},
to:
'repositories#archive'
,
as:
'archive'
get
'archive/*id'
,
constraints:
{
format:
Gitlab
::
PathRegex
.
archive_formats_regex
,
id:
/.+?/
},
to:
'repositories#archive'
,
as:
'archive'
scope
controller: :static_site_editor
do
get
'/sse/*id'
,
action: :show
,
as: :show_sse
end
resources
:artifacts
,
only:
[
:index
,
:destroy
]
resources
:artifacts
,
only:
[
:index
,
:destroy
]
resources
:jobs
,
only:
[
:index
,
:show
],
constraints:
{
id:
/\d+/
}
do
resources
:jobs
,
only:
[
:index
,
:show
],
constraints:
{
id:
/\d+/
}
do
...
...
config/routes/repository.rb
View file @
d32f3e55
...
@@ -67,10 +67,6 @@ scope format: false do
...
@@ -67,10 +67,6 @@ scope format: false do
end
end
end
end
scope
controller: :static_site_editor
do
get
'/sse/*id'
,
action: :show
,
as: :show_sse
end
get
'/tree/*id'
,
to:
'tree#show'
,
as: :tree
get
'/tree/*id'
,
to:
'tree#show'
,
as: :tree
get
'/raw/*id'
,
to:
'raw#show'
,
as: :raw
get
'/raw/*id'
,
to:
'raw#show'
,
as: :raw
get
'/blame/*id'
,
to:
'blame#show'
,
as: :blame
get
'/blame/*id'
,
to:
'blame#show'
,
as: :blame
...
...
lib/gitlab/path_regex.rb
View file @
d32f3e55
...
@@ -98,7 +98,6 @@ module Gitlab
...
@@ -98,7 +98,6 @@ module Gitlab
preview
preview
raw
raw
refs
refs
sse
tree
tree
update
update
wikis
wikis
...
...
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