diff options
Diffstat (limited to 'lib/gitlab/config/entry/validators.rb')
-rw-r--r-- | lib/gitlab/config/entry/validators.rb | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/lib/gitlab/config/entry/validators.rb b/lib/gitlab/config/entry/validators.rb index 8120f2c1243..13c6eaf4993 100644 --- a/lib/gitlab/config/entry/validators.rb +++ b/lib/gitlab/config/entry/validators.rb @@ -78,10 +78,26 @@ module Gitlab include LegacyValidationHelpers def validate_each(record, attribute, value) - unless value.is_a?(Array) && value.map { |hsh| hsh.is_a?(Hash) }.all? + unless validate_array_of_hashes(value) record.errors.add(attribute, 'should be an array of hashes') end end + + private + + def validate_array_of_hashes(value) + value.is_a?(Array) && value.all? { |obj| obj.is_a?(Hash) } + end + end + + class NestedArrayOfHashesValidator < ArrayOfHashesValidator + include NestedArrayHelpers + + def validate_each(record, attribute, value) + unless validate_nested_array(value, 1, &method(:validate_array_of_hashes)) + record.errors.add(attribute, 'should be an array containing hashes and arrays of hashes') + end + end end class ArrayOrStringValidator < ActiveModel::EachValidator |