Add latest changes from gitlab-org/gitlab@master

2 files changed, 4 insertions, 2 deletions

diff --git a/spec/frontend/issues/issue_spec.js b/spec/frontend/issues/issue_spec.js
index 089ea8dbbad..f04e766a78c 100644
--- a/spec/frontend/issues/issue_spec.js
+++ b/spec/frontend/issues/issue_spec.js
@@ -4,6 +4,7 @@ import { loadHTMLFixture, resetHTMLFixture } from 'helpers/fixtures';
 import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants';
 import Issue from '~/issues/issue';
 import axios from '~/lib/utils/axios_utils';
+import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 
 describe('Issue', () => {
   let testContext;
@@ -11,7 +12,7 @@ describe('Issue', () => {
 
   beforeEach(() => {
     mock = new MockAdapter(axios);
-    mock.onGet(/(.*)\/related_branches$/).reply(200, {});
+    mock.onGet(/(.*)\/related_branches$/).reply(HTTP_STATUS_OK, {});
 
     testContext = {};
     testContext.issue = new Issue();
diff --git a/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js
index 8413b8463c1..010c719bd84 100644
--- a/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js
+++ b/spec/frontend/issues/related_merge_requests/components/related_merge_requests_spec.js
@@ -2,6 +2,7 @@ import { shallowMount } from '@vue/test-utils';
 import MockAdapter from 'axios-mock-adapter';
 import mockData from 'test_fixtures/issues/related_merge_requests.json';
 import axios from '~/lib/utils/axios_utils';
+import { HTTP_STATUS_OK } from '~/lib/utils/http_status';
 import RelatedMergeRequests from '~/issues/related_merge_requests/components/related_merge_requests.vue';
 import createStore from '~/issues/related_merge_requests/store/index';
 import RelatedIssuableItem from '~/issuable/components/related_issuable_item.vue';
@@ -18,7 +19,7 @@ describe('RelatedMergeRequests', () => {
     document.getElementById('js-issuable-app').dataset.initial = JSON.stringify(mockData);
 
     mock = new MockAdapter(axios);
-    mock.onGet(`${API_ENDPOINT}?per_page=100`).reply(200, mockData, { 'x-total': 2 });
+    mock.onGet(`${API_ENDPOINT}?per_page=100`).reply(HTTP_STATUS_OK, mockData, { 'x-total': 2 });
 
     wrapper = shallowMount(RelatedMergeRequests, {
       store: createStore(),