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
0
Merge Requests
0
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
Boxiang Sun
gitlab-ce
Commits
9b0899cb
Commit
9b0899cb
authored
7 years ago
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove EE-specific group paths
parent
2414c69e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
19 deletions
+3
-19
lib/gitlab/path_regex.rb
lib/gitlab/path_regex.rb
+0
-7
spec/lib/gitlab/path_regex_spec.rb
spec/lib/gitlab/path_regex_spec.rb
+3
-12
No files found.
lib/gitlab/path_regex.rb
View file @
9b0899cb
...
@@ -112,13 +112,6 @@ module Gitlab
...
@@ -112,13 +112,6 @@ module Gitlab
# this would map to the activity-page of its parent.
# this would map to the activity-page of its parent.
GROUP_ROUTES
=
%w[
GROUP_ROUTES
=
%w[
-
-
analytics
audit_events
hooks
ldap
ldap_group_links
notification_setting
pipeline_quota
]
.
freeze
]
.
freeze
ILLEGAL_PROJECT_PATH_WORDS
=
PROJECT_WILDCARD_ROUTES
ILLEGAL_PROJECT_PATH_WORDS
=
PROJECT_WILDCARD_ROUTES
...
...
This diff is collapsed.
Click to expand it.
spec/lib/gitlab/path_regex_spec.rb
View file @
9b0899cb
...
@@ -152,16 +152,7 @@ describe Gitlab::PathRegex do
...
@@ -152,16 +152,7 @@ describe Gitlab::PathRegex do
let
(
:paths_after_group_id
)
do
let
(
:paths_after_group_id
)
do
group_routes
.
map
do
|
route
|
group_routes
.
map
do
|
route
|
route
.
gsub
(
STARTING_WITH_GROUP
,
''
).
split
(
'/'
).
first
route
.
gsub
(
STARTING_WITH_GROUP
,
''
).
split
(
'/'
).
first
end
.
uniq
+
ee_paths_after_group_id
end
.
uniq
end
let
(
:ee_paths_after_group_id
)
do
%w(analytics
ldap
ldap_group_links
notification_setting
audit_events
pipeline_quota hooks)
end
end
describe
'TOP_LEVEL_ROUTES'
do
describe
'TOP_LEVEL_ROUTES'
do
...
@@ -292,7 +283,7 @@ describe Gitlab::PathRegex do
...
@@ -292,7 +283,7 @@ describe Gitlab::PathRegex do
end
end
it
'rejects group routes'
do
it
'rejects group routes'
do
expect
(
subject
).
not_to
match
(
'root/
analytics
/'
)
expect
(
subject
).
not_to
match
(
'root/
-
/'
)
end
end
end
end
...
@@ -312,7 +303,7 @@ describe Gitlab::PathRegex do
...
@@ -312,7 +303,7 @@ describe Gitlab::PathRegex do
end
end
it
'rejects group routes'
do
it
'rejects group routes'
do
expect
(
subject
).
not_to
match
(
'root/
analytics/more
/'
)
expect
(
subject
).
not_to
match
(
'root/
-
/'
)
end
end
end
end
end
end
...
...
This diff is collapsed.
Click to expand it.
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