Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 8 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_content.vue b/app/assets/javascripts/diffs/components/diff_content.vue
index 5df82242d2b..9ecb9a44443 100644
--- a/app/assets/javascripts/diffs/components/diff_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_content.vue
@@ -49,8 +49,12 @@ export default {
     ...mapState({
       projectPath: state => state.diffs.projectPath,
     }),
-    ...mapGetters('diffs', ['isInlineView', 'isParallelView']),
-    ...mapGetters('diffs', ['getCommentFormForDiffFile']),
+    ...mapGetters('diffs', [
+      'isInlineView',
+      'isParallelView',
+      'getCommentFormForDiffFile',
+      'diffLines',
+    ]),
     ...mapGetters(['getNoteableData', 'noteableType', 'getUserData']),
     diffMode() {
       return getDiffMode(this.diffFile);
@@ -115,17 +119,15 @@ export default {
         <inline-diff-view
           v-if="isInlineView"
           :diff-file="diffFile"
-          :diff-lines="
-            glFeatures.unifiedDiffLines
-              ? diffFile.parallel_diff_lines
-              : diffFile.highlighted_diff_lines || []
-          "
+          :diff-lines="diffFile.highlighted_diff_lines"
           :help-page-path="helpPagePath"
         />
         <parallel-diff-view
           v-else-if="isParallelView"
           :diff-file="diffFile"
-          :diff-lines="diffFile.parallel_diff_lines || []"
+          :diff-lines="
+            glFeatures.unifiedDiffLines ? diffLines(diffFile) : diffFile.parallel_diff_lines || []
+          "
           :help-page-path="helpPagePath"
         />
         <gl-loading-icon v-if="diffFile.renderingLines" size="md" class="mt-3" />