Add latest changes from gitlab-org/gitlab@13-3-stable-ee

1 files changed, 16 insertions, 2 deletions

diff --git a/lib/gitlab/config/entry/validators.rb b/lib/gitlab/config/entry/validators.rb
index d1c23c41d35..a7ec98ace6e 100644
--- a/lib/gitlab/config/entry/validators.rb
+++ b/lib/gitlab/config/entry/validators.rb
@@ -106,12 +106,12 @@ module Gitlab
           include LegacyValidationHelpers
 
           def validate_each(record, attribute, value)
-            unless validate_duration(value)
+            unless validate_duration(value, options[:parser])
               record.errors.add(attribute, 'should be a duration')
             end
 
             if options[:limit]
-              unless validate_duration_limit(value, options[:limit])
+              unless validate_duration_limit(value, options[:limit], options[:parser])
                 record.errors.add(attribute, 'should not exceed the limit')
               end
             end
@@ -272,10 +272,24 @@ module Gitlab
           include LegacyValidationHelpers
 
           def validate_each(record, attribute, value)
+            if options[:array_values]
+              validate_key_array_values(record, attribute, value)
+            else
+              validate_key_values(record, attribute, value)
+            end
+          end
+
+          def validate_key_values(record, attribute, value)
             unless validate_variables(value)
               record.errors.add(attribute, 'should be a hash of key value pairs')
             end
           end
+
+          def validate_key_array_values(record, attribute, value)
+            unless validate_array_value_variables(value)
+              record.errors.add(attribute, 'should be a hash of key value pairs, value can be an array')
+            end
+          end
         end
 
         class ExpressionValidator < ActiveModel::EachValidator