From 3143a5d2602de521b432231d701aedcc2844c088 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Wed, 12 Apr 2017 09:44:05 +0200 Subject: Use the namespace validator for validating all paths Since the namespacevalidator now knows the difference between a top-level and another path, this could all be handled there. --- app/validators/project_path_validator.rb | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 app/validators/project_path_validator.rb (limited to 'app/validators') diff --git a/app/validators/project_path_validator.rb b/app/validators/project_path_validator.rb deleted file mode 100644 index d41bdaeab84..00000000000 --- a/app/validators/project_path_validator.rb +++ /dev/null @@ -1,27 +0,0 @@ -# ProjectPathValidator -# -# Custom validator for GitLab project path values. -# -# Values are checked for formatting and exclusion from a list of reserved path -# names. -# -# This is basically the same as the `NamespaceValidator` but it skips the validation -# of the format with `Gitlab::Regex.namespace_regex`. The format of projects -# is validated in the class itself. -class ProjectPathValidator < NamespaceValidator - def self.valid?(value) - !reserved?(value) - end - - def self.reserved?(value, type: :wildcard) - super(value, type: :wildcard) - end - - delegate :reserved?, to: :class - - def validate_each(record, attribute, value) - if reserved?(value) - record.errors.add(attribute, "#{value} is a reserved name") - end - end -end -- cgit v1.2.1