Commit 97a9a38b authored by Douwe Maan's avatar Douwe Maan

Merge branch 'bvl-reject-ee-namespace-names' into 'master'

Reject EE reserved namespace paths in CE as well

Closes #31800

See merge request !11095
parents ecdf7c26 4b9eab02
...@@ -115,13 +115,20 @@ class DynamicPathValidator < ActiveModel::EachValidator ...@@ -115,13 +115,20 @@ class DynamicPathValidator < ActiveModel::EachValidator
# this would map to the activity-page of it's parent. # this would map to the activity-page of it's parent.
GROUP_ROUTES = %w[ GROUP_ROUTES = %w[
activity activity
analytics
audit_events
avatar avatar
edit edit
group_members group_members
hooks
issues issues
labels labels
ldap
ldap_group_links
merge_requests merge_requests
milestones milestones
notification_setting
pipeline_quota
projects projects
subgroups subgroups
].freeze ].freeze
......
...@@ -36,10 +36,17 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration ...@@ -36,10 +36,17 @@ class RenameReservedDynamicPaths < ActiveRecord::Migration
DISSALLOWED_GROUP_PATHS = %w[ DISSALLOWED_GROUP_PATHS = %w[
activity activity
analytics
audit_events
avatar avatar
group_members group_members
hooks
labels labels
ldap
ldap_group_links
milestones milestones
notification_setting
pipeline_quota
subgroups subgroups
] ]
......
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