Add latest changes from gitlab-org/gitlab@master

3 files changed, 0 insertions, 8 deletions

diff --git a/spec/frontend/notes/components/diff_discussion_header_spec.js b/spec/frontend/notes/components/diff_discussion_header_spec.js
index fdc89522901..fa34a5e8d39 100644
--- a/spec/frontend/notes/components/diff_discussion_header_spec.js
+++ b/spec/frontend/notes/components/diff_discussion_header_spec.js
@@ -6,14 +6,10 @@ import createStore from '~/notes/stores';
 import mockDiffFile from '../../diffs/mock_data/diff_discussions';
 import { discussionMock } from '../mock_data';
 
-const discussionWithTwoUnresolvedNotes = 'merge_requests/resolved_diff_discussion.json';
-
 describe('diff_discussion_header component', () => {
   let store;
   let wrapper;
 
-  preloadFixtures(discussionWithTwoUnresolvedNotes);
-
   beforeEach(() => {
     window.mrTabs = {};
     store = createStore();
diff --git a/spec/frontend/notes/components/noteable_discussion_spec.js b/spec/frontend/notes/components/noteable_discussion_spec.js
index 34df39bf1c7..dd65351ef88 100644
--- a/spec/frontend/notes/components/noteable_discussion_spec.js
+++ b/spec/frontend/notes/components/noteable_discussion_spec.js
@@ -24,8 +24,6 @@ describe('noteable_discussion component', () => {
   let wrapper;
   let originalGon;
 
-  preloadFixtures(discussionWithTwoUnresolvedNotes);
-
   beforeEach(() => {
     window.mrTabs = {};
     store = createStore();
diff --git a/spec/frontend/notes/stores/getters_spec.js b/spec/frontend/notes/stores/getters_spec.js
index 4ebfc679310..4d2f86a1ecf 100644
--- a/spec/frontend/notes/stores/getters_spec.js
+++ b/spec/frontend/notes/stores/getters_spec.js
@@ -26,8 +26,6 @@ const createDiscussionNeighborParams = (discussionId, diffOrder, step) => ({
 describe('Getters Notes Store', () => {
   let state;
 
-  preloadFixtures(discussionWithTwoUnresolvedNotes);
-
   beforeEach(() => {
     state = {
       discussions: [individualNote],