Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/gitlab/redis/boolean.rb b/lib/gitlab/redis/boolean.rb
index 9b0b20fc2be..cd0877c5b13 100644
--- a/lib/gitlab/redis/boolean.rb
+++ b/lib/gitlab/redis/boolean.rb
@@ -50,7 +50,7 @@ module Gitlab
         # @return [String] the encoded boolean
         # @raise [NotABooleanError] if the value isn't true or false
         def encode(value)
-          raise NotABooleanError.new(value) unless bool?(value)
+          raise NotABooleanError, value unless bool?(value)
 
           [LABEL, to_string(value)].join(DELIMITER)
         end
@@ -61,11 +61,11 @@ module Gitlab
         # @return [Boolean] true or false
         # @raise [NotAnEncodedBooleanStringError] if the provided value isn't an encoded boolean
         def decode(value)
-          raise NotAnEncodedBooleanStringError.new(value.class) unless value.is_a?(String)
+          raise NotAnEncodedBooleanStringError, value.class unless value.is_a?(String)
 
           label, bool_str = *value.split(DELIMITER, 2)
 
-          raise NotAnEncodedBooleanStringError.new(label) unless label == LABEL
+          raise NotAnEncodedBooleanStringError, label unless label == LABEL
 
           from_string(bool_str)
         end
@@ -99,7 +99,7 @@ module Gitlab
         end
 
         def from_string(str)
-          raise NotAnEncodedBooleanStringError.new(str) unless [TRUE_STR, FALSE_STR].include?(str)
+          raise NotAnEncodedBooleanStringError, str unless [TRUE_STR, FALSE_STR].include?(str)
 
           str == TRUE_STR
         end
diff --git a/lib/gitlab/redis/hll.rb b/lib/gitlab/redis/hll.rb
index 010a6b59da5..0d04545688b 100644
--- a/lib/gitlab/redis/hll.rb
+++ b/lib/gitlab/redis/hll.rb
@@ -46,7 +46,7 @@ module Gitlab
       def validate_key!(key)
         return if KEY_REGEX.match?(key)
 
-        raise KeyFormatError.new("Invalid key format. #{key} key should have changeable parts in curly braces. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands")
+        raise KeyFormatError, "Invalid key format. #{key} key should have changeable parts in curly braces. See https://docs.gitlab.com/ee/development/redis.html#multi-key-commands"
       end
     end
   end
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index 6f80c7d439f..94ab67ef08a 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -142,7 +142,7 @@ module Gitlab
       def fetch_config
         return false unless self.class._raw_config
 
-        yaml = YAML.load(self.class._raw_config)
+        yaml = YAML.safe_load(self.class._raw_config, aliases: true)
 
         # If the file has content but it's invalid YAML, `load` returns false
         if yaml