Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 4 deletions

diff --git a/spec/javascripts/boards/board_list_common_spec.js b/spec/javascripts/boards/board_list_common_spec.js
index ada7589b795..a92d885790d 100644
--- a/spec/javascripts/boards/board_list_common_spec.js
+++ b/spec/javascripts/boards/board_list_common_spec.js
@@ -9,7 +9,7 @@ import BoardList from '~/boards/components/board_list.vue';
 
 import '~/boards/models/issue';
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, boardsMockInterceptor } from './mock_data';
 import store from '~/boards/stores';
 import boardsStore from '~/boards/stores/boards_store';
 
@@ -26,7 +26,6 @@ export default function createComponent({
   document.body.appendChild(el);
   const mock = new MockAdapter(axios);
   mock.onAny().reply(boardsMockInterceptor);
-  gl.boardService = mockBoardService();
   boardsStore.create();
 
   const BoardListComp = Vue.extend(BoardList);
diff --git a/spec/javascripts/boards/board_new_issue_spec.js b/spec/javascripts/boards/board_new_issue_spec.js
index 76675a78db2..8e4093cc25c 100644
--- a/spec/javascripts/boards/board_new_issue_spec.js
+++ b/spec/javascripts/boards/board_new_issue_spec.js
@@ -7,7 +7,7 @@ import boardNewIssue from '~/boards/components/board_new_issue.vue';
 import boardsStore from '~/boards/stores/boards_store';
 
 import '~/boards/models/list';
-import { listObj, boardsMockInterceptor, mockBoardService } from './mock_data';
+import { listObj, boardsMockInterceptor } from './mock_data';
 
 describe('Issue boards new issue form', () => {
   let vm;
@@ -36,7 +36,6 @@ describe('Issue boards new issue form', () => {
     mock = new MockAdapter(axios);
     mock.onAny().reply(boardsMockInterceptor);
 
-    gl.boardService = mockBoardService();
     boardsStore.create();
 
     list = new List(listObj);