Skip to content

G
gitlab-ce
Commit 4b9eab02 authored by Bob Van Landuyt's avatar Bob Van Landuyt
Browse files
Options

Reject EE reserved namespace paths in CE as well

parent e7b6f39f
Show whitespace changes
Inline Side-by-side
Showing with 14 additions and 0 deletions
app/validators/dynamic_path_validator.rb
View file @ 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
......
db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb
View file @ 4b9eab02
...@@ -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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7