Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 3 deletions

diff --git a/spec/frontend/monitoring/requests/index_spec.js b/spec/frontend/monitoring/requests/index_spec.js
index d105fe0def2..94f1f896e3c 100644
--- a/spec/frontend/monitoring/requests/index_spec.js
+++ b/spec/frontend/monitoring/requests/index_spec.js
@@ -5,6 +5,7 @@ import * as commonUtils from '~/lib/utils/common_utils';
 import statusCodes, {
   HTTP_STATUS_BAD_REQUEST,
   HTTP_STATUS_NO_CONTENT,
+  HTTP_STATUS_SERVICE_UNAVAILABLE,
   HTTP_STATUS_UNAUTHORIZED,
   HTTP_STATUS_UNPROCESSABLE_ENTITY,
 } from '~/lib/utils/http_status';
@@ -138,7 +139,7 @@ describe('monitoring metrics_requests', () => {
       code                                | reason
       ${HTTP_STATUS_BAD_REQUEST}          | ${'Parameters are missing or incorrect'}
       ${HTTP_STATUS_UNPROCESSABLE_ENTITY} | ${"Expression can't be executed"}
-      ${statusCodes.SERVICE_UNAVAILABLE}  | ${'Query timed out or aborted'}
+      ${HTTP_STATUS_SERVICE_UNAVAILABLE}  | ${'Query timed out or aborted'}
     `('rejects with details: "$reason" after getting an HTTP $code error', ({ code, reason }) => {
       mock.onGet(prometheusEndpoint).reply(code, {
         status: 'error',
diff --git a/spec/frontend/monitoring/store/mutations_spec.js b/spec/frontend/monitoring/store/mutations_spec.js
index 94f32777f4b..3baef743f42 100644
--- a/spec/frontend/monitoring/store/mutations_spec.js
+++ b/spec/frontend/monitoring/store/mutations_spec.js
@@ -1,4 +1,4 @@
-import httpStatusCodes, { HTTP_STATUS_BAD_REQUEST } from '~/lib/utils/http_status';
+import { HTTP_STATUS_BAD_REQUEST, HTTP_STATUS_SERVICE_UNAVAILABLE } from '~/lib/utils/http_status';
 import { dashboardEmptyStates, metricStates } from '~/monitoring/constants';
 import * as types from '~/monitoring/stores/mutation_types';
 import mutations from '~/monitoring/stores/mutations';
@@ -317,7 +317,7 @@ describe('Monitoring mutations', () => {
           metricId,
           error: {
             response: {
-              status: httpStatusCodes.SERVICE_UNAVAILABLE,
+              status: HTTP_STATUS_SERVICE_UNAVAILABLE,
             },
           },
         });