Commit 9b0899cb authored by Bob Van Landuyt's avatar Bob Van Landuyt

Remove EE-specific group paths

parent 2414c69e
...@@ -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
......
...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment