diff options
author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-11-07 13:05:08 +0100 |
---|---|---|
committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-11-07 19:52:10 +0100 |
commit | 9b0899cb809d826249bb3ad2eb35beec5bdf2190 (patch) | |
tree | 0973f623ec7401b41f369ed682d13cbfdc408312 | |
parent | 2414c69ee981cf6432e513dfdcf57a9badc5d51f (diff) | |
download | gitlab-ce-9b0899cb809d826249bb3ad2eb35beec5bdf2190.tar.gz |
Remove EE-specific group pathsbvl-free-paths
-rw-r--r-- | lib/gitlab/path_regex.rb | 7 | ||||
-rw-r--r-- | spec/lib/gitlab/path_regex_spec.rb | 15 |
2 files changed, 3 insertions, 19 deletions
diff --git a/lib/gitlab/path_regex.rb b/lib/gitlab/path_regex.rb index 6b8a4442ebd..9a91f8bf96a 100644 --- a/lib/gitlab/path_regex.rb +++ b/lib/gitlab/path_regex.rb @@ -112,13 +112,6 @@ module Gitlab # this would map to the activity-page of its parent. GROUP_ROUTES = %w[ - - analytics - audit_events - hooks - ldap - ldap_group_links - notification_setting - pipeline_quota ].freeze ILLEGAL_PROJECT_PATH_WORDS = PROJECT_WILDCARD_ROUTES diff --git a/spec/lib/gitlab/path_regex_spec.rb b/spec/lib/gitlab/path_regex_spec.rb index 751cde79a94..0ae90069b7f 100644 --- a/spec/lib/gitlab/path_regex_spec.rb +++ b/spec/lib/gitlab/path_regex_spec.rb @@ -152,16 +152,7 @@ describe Gitlab::PathRegex do let(:paths_after_group_id) do group_routes.map do |route| route.gsub(STARTING_WITH_GROUP, '').split('/').first - end.uniq + ee_paths_after_group_id - end - - let(:ee_paths_after_group_id) do - %w(analytics - ldap - ldap_group_links - notification_setting - audit_events - pipeline_quota hooks) + end.uniq end describe 'TOP_LEVEL_ROUTES' do @@ -292,7 +283,7 @@ describe Gitlab::PathRegex do end it 'rejects group routes' do - expect(subject).not_to match('root/analytics/') + expect(subject).not_to match('root/-/') end end @@ -312,7 +303,7 @@ describe Gitlab::PathRegex do end it 'rejects group routes' do - expect(subject).not_to match('root/analytics/more/') + expect(subject).not_to match('root/-/') end end end |