Add latest changes from gitlab-org/gitlab@master

2 files changed, 0 insertions, 22 deletions

diff --git a/spec/frontend/diffs/store/mutations_spec.js b/spec/frontend/diffs/store/mutations_spec.js
index f4832146708..c24d406fef3 100644
--- a/spec/frontend/diffs/store/mutations_spec.js
+++ b/spec/frontend/diffs/store/mutations_spec.js
@@ -243,8 +243,6 @@ describe('DiffsStoreMutations', () => {
       const data = {
         diff_files: [
           {
-            blob: {},
-            diff_refs: {},
             content_sha: 'abc',
             file_hash: fileHash,
             extra_field: 1,
diff --git a/spec/frontend/diffs/store/utils_spec.js b/spec/frontend/diffs/store/utils_spec.js
index 9879b4dd3f6..296069afa2c 100644
--- a/spec/frontend/diffs/store/utils_spec.js
+++ b/spec/frontend/diffs/store/utils_spec.js
@@ -1,6 +1,5 @@
 import { clone } from 'lodash';
 import * as utils from '~/diffs/store/utils';
-import { uuids } from '~/diffs/utils/uuids';
 import {
   LINE_POSITION_LEFT,
   LINE_POSITION_RIGHT,
@@ -431,7 +430,6 @@ describe('DiffsStoreUtils', () => {
   });
 
   describe('prepareDiffData', () => {
-    let fileId;
     let mock;
     let preparedDiff;
     let splitInlineDiff;
@@ -440,17 +438,6 @@ describe('DiffsStoreUtils', () => {
 
     beforeEach(() => {
       mock = getDiffFileMock();
-      [fileId] = uuids({
-        seeds: [
-          mock.blob.id,
-          mock.diff_refs.base_sha,
-          mock.diff_refs.start_sha,
-          mock.diff_refs.head_sha,
-          mock.file_identifier_hash,
-          Number(mock.blob.mode),
-        ],
-      });
-
       preparedDiff = { diff_files: [mock] };
       splitInlineDiff = {
         diff_files: [{ ...mock, parallel_diff_lines: undefined }],
@@ -468,13 +455,6 @@ describe('DiffsStoreUtils', () => {
       completedDiff.diff_files = utils.prepareDiffData(completedDiff, [mock]);
     });
 
-    it('adds a universally unique identifier to each diff file', () => {
-      expect(preparedDiff.diff_files[0].uuid).toBe(fileId);
-      expect(splitInlineDiff.diff_files[0].uuid).toBe(fileId);
-      expect(splitParallelDiff.diff_files[0].uuid).toBe(fileId);
-      expect(completedDiff.diff_files[0].uuid).toBe(fileId);
-    });
-
     it('sets the renderIt and collapsed attribute on files', () => {
       const firstParallelDiffLine = preparedDiff.diff_files[0].parallel_diff_lines[2];