Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

1 files changed, 12 insertions, 8 deletions

diff --git a/lib/gitlab/json.rb b/lib/gitlab/json.rb
index 368b621bdfb..9824b46554f 100644
--- a/lib/gitlab/json.rb
+++ b/lib/gitlab/json.rb
@@ -16,6 +16,9 @@ module Gitlab
       # @return [Boolean, String, Array, Hash]
       # @raise [JSON::ParserError] raised if parsing fails
       def parse(string, opts = {})
+        # Parse nil as nil
+        return if string.nil?
+
         # First we should ensure this really is a string, not some other
         # type which purports to be a string. This handles some legacy
         # usage of the JSON class.
@@ -30,6 +33,7 @@ module Gitlab
       end
 
       alias_method :parse!, :parse
+      alias_method :load, :parse
 
       # Restricted method for converting a Ruby object to JSON. If you
       # need to pass options to this, you should use `.generate` instead,
@@ -67,6 +71,14 @@ module Gitlab
         ::JSON.pretty_generate(object, opts)
       end
 
+      # The standard parser error we should be returning. Defined in a method
+      # so we can potentially override it later.
+      #
+      # @return [JSON::ParserError]
+      def parser_error
+        ::JSON::ParserError
+      end
+
       private
 
       # Convert JSON string into Ruby through toggleable adapters.
@@ -134,14 +146,6 @@ module Gitlab
         opts
       end
 
-      # The standard parser error we should be returning. Defined in a method
-      # so we can potentially override it later.
-      #
-      # @return [JSON::ParserError]
-      def parser_error
-        ::JSON::ParserError
-      end
-
       # @param [Nil, Boolean] an extracted :legacy_mode key from the opts hash
       # @return [Boolean]
       def legacy_mode_enabled?(arg_value)