summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-05-04 18:11:31 +0200
committerBob Van Landuyt <bob@gitlab.com>2017-05-04 18:11:31 +0200
commit4b9eab02b8cc8bd443a802d1d73da26e5b3178d9 (patch)
tree3bba76225e78ab3f76fd1691ceb1749a67b0c79b
parente7b6f39fe1b3d6d21c32f564a3efe17c1c34fd74 (diff)
downloadgitlab-ce-bvl-reject-ee-namespace-names.tar.gz
Reject EE reserved namespace paths in CE as wellbvl-reject-ee-namespace-names
-rw-r--r--app/validators/dynamic_path_validator.rb7
-rw-r--r--db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb7
2 files changed, 14 insertions, 0 deletions
diff --git a/app/validators/dynamic_path_validator.rb b/app/validators/dynamic_path_validator.rb
index 226eb6b313c..d992b0c3725 100644
--- a/app/validators/dynamic_path_validator.rb
+++ b/app/validators/dynamic_path_validator.rb
@@ -115,13 +115,20 @@ class DynamicPathValidator < ActiveModel::EachValidator
# this would map to the activity-page of it's parent.
GROUP_ROUTES = %w[
activity
+ analytics
+ audit_events
avatar
edit
group_members
+ hooks
issues
labels
+ ldap
+ ldap_group_links
merge_requests
milestones
+ notification_setting
+ pipeline_quota
projects
subgroups
].freeze
diff --git a/db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb b/db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
index a23f83205f1..08cf366f0a1 100644
--- a/db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
+++ b/db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
@@ -36,10 +36,17 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
DISSALLOWED_GROUP_PATHS = %w[
activity
+ analytics
+ audit_events
avatar
group_members
+ hooks
labels
+ ldap
+ ldap_group_links
milestones
+ notification_setting
+ pipeline_quota
subgroups
]