Reject EE reserved namespace paths in CE as well

4b9eab02 · Bob Van Landuyt · e7b6f39f · 4b9eab02 · 4b9eab02
Commit 4b9eab02 authored May 04, 2017 by Bob Van Landuyt
Showing with 14 additions and 0 deletions

app/validators/dynamic_path_validator.rb app/validators/dynamic_path_validator.rb +7 -0

db/post_migrate/20170412174900_rename_reserved_dynamic_paths.rb ...t_migrate/20170412174900_rename_reserved_dynamic_paths.rb +7 -0

No files found.
--- 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

--- 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
  ]