Add latest changes from gitlab-org/gitlab@master

5 files changed, 11 insertions, 11 deletions

diff --git a/spec/controllers/oauth/token_info_controller_spec.rb b/spec/controllers/oauth/token_info_controller_spec.rb
index 4b3539879df..4658c2702ca 100644
--- a/spec/controllers/oauth/token_info_controller_spec.rb
+++ b/spec/controllers/oauth/token_info_controller_spec.rb
@@ -9,7 +9,7 @@ RSpec.describe Oauth::TokenInfoController do
         get :show
 
         expect(response).to have_gitlab_http_status(:unauthorized)
-        expect(JSON.parse(response.body)).to include('error' => 'invalid_request')
+        expect(Gitlab::Json.parse(response.body)).to include('error' => 'invalid_request')
       end
     end
 
@@ -23,7 +23,7 @@ RSpec.describe Oauth::TokenInfoController do
         get :show, params: { access_token: access_token.token }
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(JSON.parse(response.body)).to eq(
+        expect(Gitlab::Json.parse(response.body)).to eq(
           'scope'              => %w[api],
           'scopes'             => %w[api],
           'created_at'         => access_token.created_at.to_i,
@@ -40,7 +40,7 @@ RSpec.describe Oauth::TokenInfoController do
         get :show, params: { access_token: 'unknown_token' }
 
         expect(response).to have_gitlab_http_status(:unauthorized)
-        expect(JSON.parse(response.body)).to include('error' => 'invalid_request')
+        expect(Gitlab::Json.parse(response.body)).to include('error' => 'invalid_request')
       end
     end
 
@@ -53,7 +53,7 @@ RSpec.describe Oauth::TokenInfoController do
         get :show, params: { access_token: access_token.token }
 
         expect(response).to have_gitlab_http_status(:unauthorized)
-        expect(JSON.parse(response.body)).to include('error' => 'invalid_request')
+        expect(Gitlab::Json.parse(response.body)).to include('error' => 'invalid_request')
       end
     end
 
@@ -64,7 +64,7 @@ RSpec.describe Oauth::TokenInfoController do
         get :show, params: { access_token: access_token.token }
 
         expect(response).to have_gitlab_http_status(:unauthorized)
-        expect(JSON.parse(response.body)).to include('error' => 'invalid_request')
+        expect(Gitlab::Json.parse(response.body)).to include('error' => 'invalid_request')
       end
     end
   end
diff --git a/spec/controllers/projects/artifacts_controller_spec.rb b/spec/controllers/projects/artifacts_controller_spec.rb
index c59983d5138..aa3371f7ddf 100644
--- a/spec/controllers/projects/artifacts_controller_spec.rb
+++ b/spec/controllers/projects/artifacts_controller_spec.rb
@@ -334,7 +334,7 @@ describe Projects::ArtifactsController do
         def params
           @params ||= begin
             base64_params = send_data.sub(/\Aartifacts\-entry:/, '')
-            JSON.parse(Base64.urlsafe_decode64(base64_params))
+            Gitlab::Json.parse(Base64.urlsafe_decode64(base64_params))
           end
         end
       end
diff --git a/spec/controllers/projects/cycle_analytics/events_controller_spec.rb b/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
index b828c678d0c..942e095d669 100644
--- a/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
+++ b/spec/controllers/projects/cycle_analytics/events_controller_spec.rb
@@ -17,7 +17,7 @@ describe Projects::CycleAnalytics::EventsController do
         get_issue
 
         expect(response).to be_successful
-        expect(JSON.parse(response.body)['events']).to be_empty
+        expect(Gitlab::Json.parse(response.body)['events']).to be_empty
       end
     end
 
@@ -38,7 +38,7 @@ describe Projects::CycleAnalytics::EventsController do
       it 'contains event detais' do
         get_issue
 
-        events = JSON.parse(response.body)['events']
+        events = Gitlab::Json.parse(response.body)['events']
 
         expect(events).not_to be_empty
         expect(events.first).to include('title', 'author', 'iid', 'total_time', 'created_at', 'url')
@@ -51,7 +51,7 @@ describe Projects::CycleAnalytics::EventsController do
 
           expect(response).to be_successful
 
-          expect(JSON.parse(response.body)['events']).to be_empty
+          expect(Gitlab::Json.parse(response.body)['events']).to be_empty
         end
       end
     end
diff --git a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
index 793c10f0b21..fcb9293d4a9 100644
--- a/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
+++ b/spec/controllers/projects/environments/prometheus_api_controller_spec.rb
@@ -38,7 +38,7 @@ describe Projects::Environments::PrometheusApiController do
       context 'with success result' do
         let(:service_result) { { status: :success, body: prometheus_body } }
         let(:prometheus_body) { '{"status":"success"}' }
-        let(:prometheus_json_body) { JSON.parse(prometheus_body) }
+        let(:prometheus_json_body) { Gitlab::Json.parse(prometheus_body) }
 
         it 'returns prometheus response' do
           get :proxy, params: environment_params
diff --git a/spec/controllers/projects/logs_controller_spec.rb b/spec/controllers/projects/logs_controller_spec.rb
index ea71dbe45aa..cc0690788c7 100644
--- a/spec/controllers/projects/logs_controller_spec.rb
+++ b/spec/controllers/projects/logs_controller_spec.rb
@@ -50,7 +50,7 @@ describe Projects::LogsController do
         container_name: container
       }
     end
-    let(:service_result_json) { JSON.parse(service_result.to_json) }
+    let(:service_result_json) { Gitlab::Json.parse(service_result.to_json) }
 
     let_it_be(:cluster) { create(:cluster, :provided_by_gcp, environment_scope: '*', projects: [project]) }