From 4b9eab02b8cc8bd443a802d1d73da26e5b3178d9 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@gitlab.com>
Date: Thu, 4 May 2017 18:11:31 +0200
Subject: Reject EE reserved namespace paths in CE as well

---
 app/validators/dynamic_path_validator.rb                        | 7 +++++++
 db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb | 7 +++++++
 2 files changed, 14 insertions(+)

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
   ]
 
-- 
cgit v1.2.1