Add latest changes from gitlab-org/gitlab@master

2 files changed, 5 insertions, 5 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
index 1256b3a8e52..c7d34d45f06 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/deployment/memory_usage.vue
@@ -1,7 +1,7 @@
 <script>
 import { GlLoadingIcon, GlSprintf, GlLink } from '@gitlab/ui';
 import { backOff } from '~/lib/utils/common_utils';
-import statusCodes from '~/lib/utils/http_status';
+import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status';
 import { bytesToMiB } from '~/lib/utils/number_utils';
 import { s__ } from '~/locale';
 import MemoryGraph from '~/vue_shared/components/memory_graph.vue';
@@ -107,7 +107,7 @@ export default {
       backOff((next, stop) => {
         MRWidgetService.fetchMetrics(this.metricsUrl)
           .then((res) => {
-            if (res.status === statusCodes.NO_CONTENT) {
+            if (res.status === HTTP_STATUS_NO_CONTENT) {
               this.backOffRequestCounter += 1;
               /* eslint-disable no-unused-expressions */
               this.backOffRequestCounter < 3 ? next() : stop(res);
@@ -118,7 +118,7 @@ export default {
           .catch(stop);
       })
         .then((res) => {
-          if (res.status === statusCodes.NO_CONTENT) {
+          if (res.status === HTTP_STATUS_NO_CONTENT) {
             return res;
           }
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
index 02170cc3247..394f8979a53 100644
--- a/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
+++ b/app/assets/javascripts/vue_merge_request_widget/extensions/code_quality/index.js
@@ -1,7 +1,7 @@
 import axios from '~/lib/utils/axios_utils';
 import { EXTENSION_ICONS } from '~/vue_merge_request_widget/constants';
 import { SEVERITY_ICONS_MR_WIDGET } from '~/ci/reports/codequality_report/constants';
-import httpStatusCodes from '~/lib/utils/http_status';
+import { HTTP_STATUS_NO_CONTENT } from '~/lib/utils/http_status';
 import { parseCodeclimateMetrics } from '~/ci/reports/codequality_report/store/utils/codequality_parser';
 import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
 import { i18n } from './constants';
@@ -43,7 +43,7 @@ export default {
         return {
           ...response,
           data: {
-            parsingInProgress: status === httpStatusCodes.NO_CONTENT,
+            parsingInProgress: status === HTTP_STATUS_NO_CONTENT,
             resolvedErrors: parseCodeclimateMetrics(data.resolved_errors, this.blobPath.head_path),
             newErrors: parseCodeclimateMetrics(data.new_errors, this.blobPath.head_path),
             existingErrors: parseCodeclimateMetrics(data.existing_errors, this.blobPath.head_path),