Add latest changes from gitlab-org/gitlab@master

1 files changed, 86 insertions, 25 deletions

diff --git a/spec/frontend/diffs/mock_data/diff_file.js b/spec/frontend/diffs/mock_data/diff_file.js
index e4b2fdf6ede..c2a4424ee95 100644
--- a/spec/frontend/diffs/mock_data/diff_file.js
+++ b/spec/frontend/diffs/mock_data/diff_file.js
@@ -56,8 +56,8 @@ export default {
       old_line: null,
       new_line: 1,
       discussions: [],
-      text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
-      rich_text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
+      text: '<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
+      rich_text: '<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
       meta_data: null,
     },
     {
@@ -66,8 +66,8 @@ export default {
       old_line: null,
       new_line: 2,
       discussions: [],
-      text: '+<span id="LC2" class="line" lang="plaintext"></span>\n',
-      rich_text: '+<span id="LC2" class="line" lang="plaintext"></span>\n',
+      text: '<span id="LC2" class="line" lang="plaintext"></span>\n',
+      rich_text: '<span id="LC2" class="line" lang="plaintext"></span>\n',
       meta_data: null,
     },
     {
@@ -76,8 +76,8 @@ export default {
       old_line: 1,
       new_line: 3,
       discussions: [],
-      text: ' <span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
-      rich_text: ' <span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
+      text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
+      rich_text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
       meta_data: null,
     },
     {
@@ -86,8 +86,8 @@ export default {
       old_line: 2,
       new_line: 4,
       discussions: [],
-      text: ' <span id="LC4" class="line" lang="plaintext"></span>\n',
-      rich_text: ' <span id="LC4" class="line" lang="plaintext"></span>\n',
+      text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
+      rich_text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
       meta_data: null,
     },
     {
@@ -96,8 +96,38 @@ export default {
       old_line: 3,
       new_line: 5,
       discussions: [],
-      text: ' <span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
-      rich_text: ' <span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
+      text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
+      rich_text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
+      meta_data: null,
+    },
+    {
+      line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_6',
+      type: 'old',
+      old_line: 4,
+      new_line: null,
+      discussions: [],
+      text: '<span id="LC6" class="line" lang="plaintext"></span>\n',
+      rich_text: '<span id="LC6" class="line" lang="plaintext"></span>\n',
+      meta_data: null,
+    },
+    {
+      line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_7',
+      type: 'new',
+      old_line: null,
+      new_line: 5,
+      discussions: [],
+      text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+      rich_text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+      meta_data: null,
+    },
+    {
+      line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_9',
+      type: 'new',
+      old_line: null,
+      new_line: 6,
+      discussions: [],
+      text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+      rich_text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
       meta_data: null,
     },
     {
@@ -116,43 +146,39 @@ export default {
   ],
   parallel_diff_lines: [
     {
-      left: {
-        type: 'empty-cell',
-      },
+      left: null,
       right: {
         line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_1',
         type: 'new',
         old_line: null,
         new_line: 1,
         discussions: [],
-        text: '+<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
+        text: '<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
         rich_text: '<span id="LC1" class="line" lang="plaintext">  - Bad dates</span>\n',
         meta_data: null,
       },
     },
     {
-      left: {
-        type: 'empty-cell',
-      },
+      left: null,
       right: {
         line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_2',
         type: 'new',
         old_line: null,
         new_line: 2,
         discussions: [],
-        text: '+<span id="LC2" class="line" lang="plaintext"></span>\n',
+        text: '<span id="LC2" class="line" lang="plaintext"></span>\n',
         rich_text: '<span id="LC2" class="line" lang="plaintext"></span>\n',
         meta_data: null,
       },
     },
     {
       left: {
-        line_Code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_3',
+        line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_3',
         type: null,
         old_line: 1,
         new_line: 3,
         discussions: [],
-        text: ' <span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
+        text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
         rich_text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
         meta_data: null,
       },
@@ -162,7 +188,7 @@ export default {
         old_line: 1,
         new_line: 3,
         discussions: [],
-        text: ' <span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
+        text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
         rich_text: '<span id="LC3" class="line" lang="plaintext">v6.8.0</span>\n',
         meta_data: null,
       },
@@ -174,7 +200,7 @@ export default {
         old_line: 2,
         new_line: 4,
         discussions: [],
-        text: ' <span id="LC4" class="line" lang="plaintext"></span>\n',
+        text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
         rich_text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
         meta_data: null,
       },
@@ -184,7 +210,7 @@ export default {
         old_line: 2,
         new_line: 4,
         discussions: [],
-        text: ' <span id="LC4" class="line" lang="plaintext"></span>\n',
+        text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
         rich_text: '<span id="LC4" class="line" lang="plaintext"></span>\n',
         meta_data: null,
       },
@@ -196,7 +222,7 @@ export default {
         old_line: 3,
         new_line: 5,
         discussions: [],
-        text: ' <span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
+        text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
         rich_text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
         meta_data: null,
       },
@@ -206,13 +232,48 @@ export default {
         old_line: 3,
         new_line: 5,
         discussions: [],
-        text: ' <span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
+        text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
         rich_text: '<span id="LC5" class="line" lang="plaintext">v6.7.0</span>\n',
         meta_data: null,
       },
     },
     {
       left: {
+        line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_6',
+        type: 'old',
+        old_line: 4,
+        new_line: null,
+        discussions: [],
+        text: '<span id="LC6" class="line" lang="plaintext"></span>\n',
+        rich_text: '<span id="LC6" class="line" lang="plaintext"></span>\n',
+        meta_data: null,
+      },
+      right: {
+        line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_7',
+        type: 'new',
+        old_line: null,
+        new_line: 5,
+        discussions: [],
+        text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+        rich_text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+        meta_data: null,
+      },
+    },
+    {
+      left: null,
+      right: {
+        line_code: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a_1_9',
+        type: 'new',
+        old_line: null,
+        new_line: 6,
+        discussions: [],
+        text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+        rich_text: '<span id="LC7" class="line" lang="plaintext"></span>\n',
+        meta_data: null,
+      },
+    },
+    {
+      left: {
         line_code: null,
         type: 'match',
         old_line: null,