Rename `NamespaceValidator` to `DynamicPathValidator`

This reflects better that it validates paths instead of a namespace model

4 files changed, 9 insertions, 6 deletions

diff --git a/app/models/namespace.rb b/app/models/namespace.rb
index 1570470d63f..397dc7a25ab 100644
--- a/app/models/namespace.rb
+++ b/app/models/namespace.rb
@@ -33,7 +33,7 @@ class Namespace < ActiveRecord::Base
   validates :path,
     presence: true,
     length: { maximum: 255 },
-    namespace: true
+    dynamic_path: true
 
   validate :nesting_level_allowed
 
diff --git a/app/models/project.rb b/app/models/project.rb
index 0ed4b4fddd6..9ebb9638ca4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -196,7 +196,7 @@ class Project < ActiveRecord::Base
               message: Gitlab::Regex.project_name_regex_message }
   validates :path,
     presence: true,
-    namespace: true,
+    dynamic_path: true,
     length: { maximum: 255 },
     format: { with: Gitlab::Regex.project_path_regex,
               message: Gitlab::Regex.project_path_regex_message },
diff --git a/app/models/user.rb b/app/models/user.rb
index bd9c9f99663..2b7ebe6c1a7 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -118,7 +118,7 @@ class User < ActiveRecord::Base
     presence: true,
     numericality: { greater_than_or_equal_to: 0, less_than_or_equal_to: Gitlab::Database::MAX_INT_VALUE }
   validates :username,
-    namespace: true,
+    dynamic_path: true,
     presence: true,
     uniqueness: { case_sensitive: false }
 
diff --git a/app/validators/namespace_validator.rb b/app/validators/dynamic_path_validator.rb
index ed71d5ad5b5..ce363c052d8 100644
--- a/app/validators/namespace_validator.rb
+++ b/app/validators/dynamic_path_validator.rb
@@ -1,10 +1,11 @@
-# NamespaceValidator
+# DynamicPathValidator
 #
-# Custom validator for GitLab namespace values.
+# Custom validator for GitLab path values.
+# These paths are assigned to `Namespace` (& `Group` as a subclass) & `Project`
 #
 # Values are checked for formatting and exclusion from a list of reserved path
 # names.
-class NamespaceValidator < ActiveModel::EachValidator
+class DynamicPathValidator < ActiveModel::EachValidator
   # All routes that appear on the top level must be listed here.
   # This will make sure that groups cannot be created with these names
   # as these routes would be masked by the paths already in place.
@@ -124,6 +125,8 @@ class NamespaceValidator < ActiveModel::EachValidator
       record.has_parent? ? :wildcard : :top_level
     when Project
       :wildcard
+    when User
+      :top_level
     else
       :strict
     end