Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 3 deletions

diff --git a/lib/container_registry/client.rb b/lib/container_registry/client.rb
index 56f556c229a..fdd889f5416 100644
--- a/lib/container_registry/client.rb
+++ b/lib/container_registry/client.rb
@@ -83,7 +83,7 @@ module ContainerRegistry
       image = {
         config: {}
       }
-      image, image_digest = upload_raw_blob(path, JSON.pretty_generate(image))
+      image, image_digest = upload_raw_blob(path, Gitlab::Json.pretty_generate(image))
       return unless image
 
       {
@@ -109,7 +109,7 @@ module ContainerRegistry
     def put_tag(name, reference, manifest)
       response = faraday.put("/v2/#{name}/manifests/#{reference}") do |req|
         req.headers['Content-Type'] = DOCKER_DISTRIBUTION_MANIFEST_V2_TYPE
-        req.body = JSON.pretty_generate(manifest)
+        req.body = Gitlab::Json.pretty_generate(manifest)
       end
 
       response.headers['docker-content-digest'] if response.success?
diff --git a/lib/container_registry/config.rb b/lib/container_registry/config.rb
index 740c0e13da0..40dd92befd2 100644
--- a/lib/container_registry/config.rb
+++ b/lib/container_registry/config.rb
@@ -6,7 +6,7 @@ module ContainerRegistry
 
     def initialize(tag, blob)
       @tag, @blob = tag, blob
-      @data = JSON.parse(blob.data)
+      @data = Gitlab::Json.parse(blob.data)
     end
 
     def [](key)