diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 22:51:04 +0100 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-02-14 22:52:20 +0100 |
commit | 84c14ac0c2ec4957f5fe4c53be3d068ee2f1743a (patch) | |
tree | 8445d80af4e64d780d3b01d897c5b8da76248901 /app/validators | |
parent | 48db60e47987a3a7c08856423daf7713eb256e74 (diff) | |
download | gitlab-ce-84c14ac0c2ec4957f5fe4c53be3d068ee2f1743a.tar.gz |
Improve validation message and add changelogmc/fix/project-variables-scope
Diffstat (limited to 'app/validators')
-rw-r--r-- | app/validators/variable_duplicates_validator.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/validators/variable_duplicates_validator.rb b/app/validators/variable_duplicates_validator.rb index 37e0a476399..4bfa3c45303 100644 --- a/app/validators/variable_duplicates_validator.rb +++ b/app/validators/variable_duplicates_validator.rb @@ -20,7 +20,7 @@ class VariableDuplicatesValidator < ActiveModel::EachValidator def validate_duplicates(record, attribute, values) duplicates = values.reject(&:marked_for_destruction?).group_by(&:key).select { |_, v| v.many? }.map(&:first) if duplicates.any? - error_message = "has duplicate variables (#{duplicates.join(", ")})" + error_message = "have duplicate values (#{duplicates.join(", ")})" error_message += " for #{values.first.send(options[:scope])} scope" if options[:scope] # rubocop:disable GitlabSecurity/PublicSend record.errors.add(attribute, error_message) end |