Add latest changes from gitlab-org/gitlab@master

34 files changed, 43 insertions, 43 deletions

diff --git a/lib/api/helpers/internal_helpers.rb b/lib/api/helpers/internal_helpers.rb
index 31272c537a3..b05e82a541d 100644
--- a/lib/api/helpers/internal_helpers.rb
+++ b/lib/api/helpers/internal_helpers.rb
@@ -51,7 +51,7 @@ module API
       def parse_env
         return {} if params[:env].blank?
 
-        JSON.parse(params[:env])
+        Gitlab::Json.parse(params[:env])
       rescue JSON::ParserError
         {}
       end
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)
diff --git a/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb b/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
index 14e14f28439..956f9daa493 100644
--- a/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
+++ b/lib/gitlab/background_migration/migrate_issue_trackers_sensitive_data.rb
@@ -79,7 +79,7 @@ module Gitlab
         data = { 'jira_tracker_data' => [], 'issue_tracker_data' => [] }
         select_all(query).each do |service|
           begin
-            properties = JSON.parse(service['properties'])
+            properties = Gitlab::Json.parse(service['properties'])
           rescue JSON::ParserError
             logger.warn(
               message: 'Properties data not parsed - invalid json',
diff --git a/lib/gitlab/chat_name_token.rb b/lib/gitlab/chat_name_token.rb
index 8b3c5dc9e8b..9b4cb9d0134 100644
--- a/lib/gitlab/chat_name_token.rb
+++ b/lib/gitlab/chat_name_token.rb
@@ -16,7 +16,7 @@ module Gitlab
     def get
       Gitlab::Redis::SharedState.with do |redis|
         data = redis.get(redis_shared_state_key)
-        JSON.parse(data, symbolize_names: true) if data
+        Gitlab::Json.parse(data, symbolize_names: true) if data
       end
     end
 
diff --git a/lib/gitlab/ci/ansi2html.rb b/lib/gitlab/ci/ansi2html.rb
index 3a05feee156..e145bd2e9df 100644
--- a/lib/gitlab/ci/ansi2html.rb
+++ b/lib/gitlab/ci/ansi2html.rb
@@ -353,7 +353,7 @@ module Gitlab
 
         def restore_state(new_state, stream)
           state = Base64.urlsafe_decode64(new_state)
-          state = JSON.parse(state, symbolize_names: true)
+          state = Gitlab::Json.parse(state, symbolize_names: true)
           return if state[:offset].to_i > stream.size
 
           STATE_PARAMS.each do |param|
diff --git a/lib/gitlab/ci/ansi2json/state.rb b/lib/gitlab/ci/ansi2json/state.rb
index 7e1a8102a35..38d36e6950c 100644
--- a/lib/gitlab/ci/ansi2json/state.rb
+++ b/lib/gitlab/ci/ansi2json/state.rb
@@ -90,7 +90,7 @@ module Gitlab
           decoded_state = Base64.urlsafe_decode64(state)
           return unless decoded_state.present?
 
-          JSON.parse(decoded_state)
+          Gitlab::Json.parse(decoded_state)
         end
       end
     end
diff --git a/lib/gitlab/ci/build/artifacts/metadata.rb b/lib/gitlab/ci/build/artifacts/metadata.rb
index 1c3ce08be76..c5afb16ab1a 100644
--- a/lib/gitlab/ci/build/artifacts/metadata.rb
+++ b/lib/gitlab/ci/build/artifacts/metadata.rb
@@ -32,7 +32,7 @@ module Gitlab
               raise ParserError, 'Errors field not found!' unless errors
 
               begin
-                JSON.parse(errors)
+                Gitlab::Json.parse(errors)
               rescue JSON::ParserError
                 raise ParserError, 'Invalid errors field!'
               end
@@ -71,7 +71,7 @@ module Gitlab
                 next unless path =~ match_pattern
                 next if path =~ INVALID_PATH_PATTERN
 
-                entries[path] = JSON.parse(meta, symbolize_names: true)
+                entries[path] = Gitlab::Json.parse(meta, symbolize_names: true)
               rescue JSON::ParserError, Encoding::CompatibilityError
                 next
               end
diff --git a/lib/gitlab/ci/parsers/terraform/tfplan.rb b/lib/gitlab/ci/parsers/terraform/tfplan.rb
index eddd8b4c665..26a18c6603e 100644
--- a/lib/gitlab/ci/parsers/terraform/tfplan.rb
+++ b/lib/gitlab/ci/parsers/terraform/tfplan.rb
@@ -8,7 +8,7 @@ module Gitlab
           TfplanParserError = Class.new(Gitlab::Ci::Parsers::ParserError)
 
           def parse!(json_data, terraform_reports, artifact:)
-            tfplan = JSON.parse(json_data).tap do |parsed_data|
+            tfplan = Gitlab::Json.parse(json_data).tap do |parsed_data|
               parsed_data['job_path'] = Gitlab::Routing.url_helpers.project_job_path(
                 artifact.job.project, artifact.job
               )
diff --git a/lib/gitlab/danger/emoji_checker.rb b/lib/gitlab/danger/emoji_checker.rb
index e31a6ae5011..a2867087428 100644
--- a/lib/gitlab/danger/emoji_checker.rb
+++ b/lib/gitlab/danger/emoji_checker.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'json'
+require_relative '../json'
 
 module Gitlab
   module Danger
@@ -25,8 +25,8 @@ module Gitlab
       )}x.freeze
 
       def initialize
-        names = JSON.parse(File.read(DIGESTS)).keys +
-          JSON.parse(File.read(ALIASES)).keys
+        names = Gitlab::Json.parse(File.read(DIGESTS)).keys +
+          Gitlab::Json.parse(File.read(ALIASES)).keys
 
         @emoji = names.map { |name| ":#{name}:" }
       end
diff --git a/lib/gitlab/danger/request_helper.rb b/lib/gitlab/danger/request_helper.rb
index 06da4ed9ad3..ef51c3f2052 100644
--- a/lib/gitlab/danger/request_helper.rb
+++ b/lib/gitlab/danger/request_helper.rb
@@ -16,7 +16,7 @@ module Gitlab
           raise HTTPError, "Failed to read #{url}: #{rsp.code} #{rsp.message}"
         end
 
-        JSON.parse(rsp.body)
+        Gitlab::Json.parse(rsp.body)
       end
     end
   end
diff --git a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
index 565f34b78b7..2c9d0d6c0d1 100644
--- a/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
+++ b/lib/gitlab/database/rename_reserved_paths_migration/v1/rename_base.rb
@@ -157,7 +157,7 @@ module Gitlab
               failed_reverts = []
 
               while rename_info = redis.lpop(key)
-                path_before_rename, path_after_rename = JSON.parse(rename_info)
+                path_before_rename, path_after_rename = Gitlab::Json.parse(rename_info)
                 say "renaming #{type} from #{path_after_rename} back to #{path_before_rename}"
                 begin
                   yield(path_before_rename, path_after_rename)
diff --git a/lib/gitlab/dependency_linker/json_linker.rb b/lib/gitlab/dependency_linker/json_linker.rb
index 298d214df61..86dc7efb0d9 100644
--- a/lib/gitlab/dependency_linker/json_linker.rb
+++ b/lib/gitlab/dependency_linker/json_linker.rb
@@ -39,7 +39,7 @@ module Gitlab
       end
 
       def json
-        @json ||= JSON.parse(plain_text) rescue nil
+        @json ||= Gitlab::Json.parse(plain_text) rescue nil
       end
     end
   end
diff --git a/lib/gitlab/diff/highlight_cache.rb b/lib/gitlab/diff/highlight_cache.rb
index 01ec9798fe4..ccf09b37b9b 100644
--- a/lib/gitlab/diff/highlight_cache.rb
+++ b/lib/gitlab/diff/highlight_cache.rb
@@ -156,7 +156,7 @@ module Gitlab
         end
 
         results.map! do |result|
-          JSON.parse(extract_data(result), symbolize_names: true) unless result.nil?
+          Gitlab::Json.parse(extract_data(result), symbolize_names: true) unless result.nil?
         end
 
         file_paths.zip(results).to_h
diff --git a/lib/gitlab/diff/position.rb b/lib/gitlab/diff/position.rb
index 8b99fd5cd42..10ad23b7774 100644
--- a/lib/gitlab/diff/position.rb
+++ b/lib/gitlab/diff/position.rb
@@ -68,7 +68,7 @@ module Gitlab
       end
 
       def to_json(opts = nil)
-        JSON.generate(formatter.to_h, opts)
+        Gitlab::Json.generate(formatter.to_h, opts)
       end
 
       def as_json(opts = nil)
diff --git a/lib/gitlab/discussions_diff/highlight_cache.rb b/lib/gitlab/discussions_diff/highlight_cache.rb
index 1f64883cb69..75d5a5df74b 100644
--- a/lib/gitlab/discussions_diff/highlight_cache.rb
+++ b/lib/gitlab/discussions_diff/highlight_cache.rb
@@ -42,7 +42,7 @@ module Gitlab
           content.map! do |lines|
             next unless lines
 
-            JSON.parse(lines).map! do |line|
+            Gitlab::Json.parse(lines).map! do |line|
               Gitlab::Diff::Line.safe_init_from_hash(line)
             end
           end
diff --git a/lib/gitlab/emoji.rb b/lib/gitlab/emoji.rb
index 305bcada2f5..bcf92b35720 100644
--- a/lib/gitlab/emoji.rb
+++ b/lib/gitlab/emoji.rb
@@ -21,7 +21,7 @@ module Gitlab
     end
 
     def emojis_aliases
-      @emoji_aliases ||= JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'aliases.json')))
+      @emoji_aliases ||= Gitlab::Json.parse(File.read(Rails.root.join('fixtures', 'emojis', 'aliases.json')))
     end
 
     def emoji_filename(name)
@@ -63,7 +63,7 @@ module Gitlab
 
     def emoji_unicode_versions_by_name
       @emoji_unicode_versions_by_name ||=
-        JSON.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
+        Gitlab::Json.parse(File.read(Rails.root.join('fixtures', 'emojis', 'emoji-unicode-version-map.json')))
     end
   end
 end
diff --git a/lib/gitlab/external_authorization/response.rb b/lib/gitlab/external_authorization/response.rb
index 4f3fe5882db..04f9688fad0 100644
--- a/lib/gitlab/external_authorization/response.rb
+++ b/lib/gitlab/external_authorization/response.rb
@@ -28,7 +28,7 @@ module Gitlab
       end
 
       def parse_response!
-        JSON.parse(@excon_response.body)
+        Gitlab::Json.parse(@excon_response.body)
       rescue JSON::JSONError
         # The JSON response is optional, so don't fail when it's missing
         nil
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb
index 79ea3d2de6c..3aaed0edb87 100644
--- a/lib/gitlab/gitaly_client.rb
+++ b/lib/gitlab/gitaly_client.rb
@@ -130,7 +130,7 @@ module Gitlab
     end
 
     def self.address_metadata(storage)
-      Base64.strict_encode64(JSON.dump(storage => connection_data(storage)))
+      Base64.strict_encode64(Gitlab::Json.dump(storage => connection_data(storage)))
     end
 
     def self.connection_data(storage)
@@ -458,7 +458,7 @@ module Gitlab
 
     def self.filesystem_id_from_disk(storage)
       metadata_file = File.read(storage_metadata_file_path(storage))
-      metadata_hash = JSON.parse(metadata_file)
+      metadata_hash = Gitlab::Json.parse(metadata_file)
       metadata_hash['gitaly_filesystem_id']
     rescue Errno::ENOENT, Errno::EACCES, JSON::ParserError
       nil
diff --git a/lib/gitlab/graphql/pagination/keyset/connection.rb b/lib/gitlab/graphql/pagination/keyset/connection.rb
index 5466924a794..1a32ab468b1 100644
--- a/lib/gitlab/graphql/pagination/keyset/connection.rb
+++ b/lib/gitlab/graphql/pagination/keyset/connection.rb
@@ -128,7 +128,7 @@ module Gitlab
           end
 
           def ordering_from_encoded_json(cursor)
-            JSON.parse(decode(cursor))
+            Gitlab::Json.parse(decode(cursor))
           rescue JSON::ParserError
             raise Gitlab::Graphql::Errors::ArgumentError, "Please provide a valid cursor"
           end
diff --git a/lib/gitlab/graphql/variables.rb b/lib/gitlab/graphql/variables.rb
index b13ea37c21f..1c6fb011012 100644
--- a/lib/gitlab/graphql/variables.rb
+++ b/lib/gitlab/graphql/variables.rb
@@ -20,7 +20,7 @@ module Gitlab
         case ambiguous_param
         when String
           if ambiguous_param.present?
-            ensure_hash(JSON.parse(ambiguous_param))
+            ensure_hash(Gitlab::Json.parse(ambiguous_param))
           else
             {}
           end
diff --git a/lib/gitlab/health_checks/puma_check.rb b/lib/gitlab/health_checks/puma_check.rb
index 9f09070a57d..2dc8a093572 100644
--- a/lib/gitlab/health_checks/puma_check.rb
+++ b/lib/gitlab/health_checks/puma_check.rb
@@ -21,7 +21,7 @@ module Gitlab
           return unless Gitlab::Runtime.puma?
 
           stats = Puma.stats
-          stats = JSON.parse(stats)
+          stats = Gitlab::Json.parse(stats)
 
           # If `workers` is missing this means that
           # Puma server is running in single mode
diff --git a/lib/gitlab/metrics/samplers/puma_sampler.rb b/lib/gitlab/metrics/samplers/puma_sampler.rb
index f788f51b1ce..98dd517ee3b 100644
--- a/lib/gitlab/metrics/samplers/puma_sampler.rb
+++ b/lib/gitlab/metrics/samplers/puma_sampler.rb
@@ -26,7 +26,7 @@ module Gitlab
           json_stats = puma_stats
           return unless json_stats
 
-          stats = JSON.parse(json_stats)
+          stats = Gitlab::Json.parse(json_stats)
 
           if cluster?(stats)
             sample_cluster(stats)
diff --git a/lib/gitlab/phabricator_import/conduit/response.rb b/lib/gitlab/phabricator_import/conduit/response.rb
index 6053ecfbd5e..1b03cfa05e6 100644
--- a/lib/gitlab/phabricator_import/conduit/response.rb
+++ b/lib/gitlab/phabricator_import/conduit/response.rb
@@ -9,7 +9,7 @@ module Gitlab
                   "Phabricator responded with #{http_response.status}"
           end
 
-          response = new(JSON.parse(http_response.body))
+          response = new(Gitlab::Json.parse(http_response.body))
 
           unless response.success?
             raise ResponseError,
diff --git a/lib/gitlab/prometheus_client.rb b/lib/gitlab/prometheus_client.rb
index 71a0d528bd7..e3559644142 100644
--- a/lib/gitlab/prometheus_client.rb
+++ b/lib/gitlab/prometheus_client.rb
@@ -163,7 +163,7 @@ module Gitlab
     end
 
     def parse_json(response_body)
-      JSON.parse(response_body)
+      Gitlab::Json.parse(response_body)
     rescue JSON::ParserError
       raise PrometheusClient::Error, 'Parsing response failed'
     end
diff --git a/lib/gitlab/sanitizers/exif.rb b/lib/gitlab/sanitizers/exif.rb
index 5eeb8b00ff3..7e22bf4d7df 100644
--- a/lib/gitlab/sanitizers/exif.rb
+++ b/lib/gitlab/sanitizers/exif.rb
@@ -152,7 +152,7 @@ module Gitlab
 
         raise "failed to get exif tags: #{output}" if status != 0
 
-        JSON.parse(output).first
+        Gitlab::Json.parse(output).first
       end
     end
   end
diff --git a/lib/gitlab/sidekiq_daemon/monitor.rb b/lib/gitlab/sidekiq_daemon/monitor.rb
index 0723b514c90..1f1d63877b5 100644
--- a/lib/gitlab/sidekiq_daemon/monitor.rb
+++ b/lib/gitlab/sidekiq_daemon/monitor.rb
@@ -134,7 +134,7 @@ module Gitlab
       end
 
       def safe_parse(message)
-        JSON.parse(message)
+        Gitlab::Json.parse(message)
       rescue JSON::ParserError
       end
 
diff --git a/lib/gitlab/sidekiq_middleware/arguments_logger.rb b/lib/gitlab/sidekiq_middleware/arguments_logger.rb
index 2859aa5f4a6..fe5213fc5d7 100644
--- a/lib/gitlab/sidekiq_middleware/arguments_logger.rb
+++ b/lib/gitlab/sidekiq_middleware/arguments_logger.rb
@@ -4,7 +4,7 @@ module Gitlab
   module SidekiqMiddleware
     class ArgumentsLogger
       def call(worker, job, queue)
-        Sidekiq.logger.info "arguments: #{JSON.dump(job['args'])}"
+        Sidekiq.logger.info "arguments: #{Gitlab::Json.dump(job['args'])}"
         yield
       end
     end
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb
index acec7cb30a6..75196a03edc 100644
--- a/lib/gitlab/workhorse.rb
+++ b/lib/gitlab/workhorse.rb
@@ -205,7 +205,7 @@ module Gitlab
       # This is the outermost encoding of a senddata: header. It is safe for
       # inclusion in HTTP response headers
       def encode(hash)
-        Base64.urlsafe_encode64(JSON.dump(hash))
+        Base64.urlsafe_encode64(Gitlab::Json.dump(hash))
       end
 
       # This is for encoding individual fields inside the senddata JSON that
diff --git a/lib/mattermost/client.rb b/lib/mattermost/client.rb
index 293d0c563c5..01a9567491f 100644
--- a/lib/mattermost/client.rb
+++ b/lib/mattermost/client.rb
@@ -49,7 +49,7 @@ module Mattermost
     end
 
     def json_response(response)
-      json_response = JSON.parse(response.body)
+      json_response = Gitlab::Json.parse(response.body)
 
       unless response.success?
         raise Mattermost::ClientError.new(json_response['message'] || 'Undefined error')
diff --git a/lib/quality/helm3_client.rb b/lib/quality/helm3_client.rb
index afea73cbc50..28ff3ef0271 100644
--- a/lib/quality/helm3_client.rb
+++ b/lib/quality/helm3_client.rb
@@ -65,7 +65,7 @@ module Quality
         %(--output json),
         *args
       ]
-      releases = JSON.parse(run_command(command))
+      releases = Gitlab::Json.parse(run_command(command))
 
       releases.map do |release|
         Release.new(*release.values_at(*RELEASE_JSON_ATTRIBUTES))
diff --git a/lib/rspec_flaky/listener.rb b/lib/rspec_flaky/listener.rb
index bf15130d17e..37e4e16e87e 100644
--- a/lib/rspec_flaky/listener.rb
+++ b/lib/rspec_flaky/listener.rb
@@ -40,7 +40,7 @@ module RspecFlaky
       new_flaky_examples = flaky_examples - suite_flaky_examples
       if new_flaky_examples.any?
         Rails.logger.warn "\nNew flaky examples detected:\n"
-        Rails.logger.warn JSON.pretty_generate(new_flaky_examples.to_h)
+        Rails.logger.warn Gitlab::Json.pretty_generate(new_flaky_examples.to_h)
 
         RspecFlaky::Report.new(new_flaky_examples).write(RspecFlaky::Config.new_flaky_examples_report_path)
         # write_report_file(new_flaky_examples, RspecFlaky::Config.new_flaky_examples_report_path)
diff --git a/lib/rspec_flaky/report.rb b/lib/rspec_flaky/report.rb
index 73f30362cfe..c7860f35f62 100644
--- a/lib/rspec_flaky/report.rb
+++ b/lib/rspec_flaky/report.rb
@@ -19,7 +19,7 @@ module RspecFlaky
     end
 
     def self.load_json(json)
-      new(RspecFlaky::FlakyExamplesCollection.new(JSON.parse(json)))
+      new(RspecFlaky::FlakyExamplesCollection.new(Gitlab::Json.parse(json)))
     end
 
     def initialize(flaky_examples)
@@ -40,7 +40,7 @@ module RspecFlaky
       report_path_dir = File.dirname(file_path)
       FileUtils.mkdir_p(report_path_dir) unless Dir.exist?(report_path_dir)
 
-      File.write(file_path, JSON.pretty_generate(flaky_examples.to_h))
+      File.write(file_path, Gitlab::Json.pretty_generate(flaky_examples.to_h))
     end
 
     def prune_outdated(days: OUTDATED_DAYS_THRESHOLD)
diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index 8cf7c9e89f0..3833689e07e 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -7,7 +7,7 @@ namespace :gemojione do
     aliases = {}
 
     index_file = File.join(Rails.root, 'fixtures', 'emojis', 'index.json')
-    index = JSON.parse(File.read(index_file))
+    index = Gitlab::Json.parse(File.read(index_file))
 
     index.each_pair do |key, data|
       data['aliases'].each do |a|
@@ -19,7 +19,7 @@ namespace :gemojione do
 
     out = File.join(Rails.root, 'fixtures', 'emojis', 'aliases.json')
     File.open(out, 'w') do |handle|
-      handle.write(JSON.pretty_generate(aliases, indent: '   ', space: '', space_before: ''))
+      handle.write(Gitlab::Json.pretty_generate(aliases, indent: '   ', space: '', space_before: ''))
     end
   end
 
@@ -58,7 +58,7 @@ namespace :gemojione do
 
     out = File.join(Rails.root, 'fixtures', 'emojis', 'digests.json')
     File.open(out, 'w') do |handle|
-      handle.write(JSON.pretty_generate(resultant_emoji_map))
+      handle.write(Gitlab::Json.pretty_generate(resultant_emoji_map))
     end
   end