Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 2 deletions

diff --git a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
index 434d554d148..34aa15856d2 100644
--- a/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_gutter_content.vue
@@ -72,7 +72,7 @@ export default {
     lineCode() {
       return (
         this.line.line_code ||
-        (this.line.left && this.line.line.left.line_code) ||
+        (this.line.left && this.line.left.line_code) ||
         (this.line.right && this.line.right.line_code)
       );
     },
diff --git a/app/assets/javascripts/diffs/store/utils.js b/app/assets/javascripts/diffs/store/utils.js
index 2326018b999..281a0de1fc2 100644
--- a/app/assets/javascripts/diffs/store/utils.js
+++ b/app/assets/javascripts/diffs/store/utils.js
@@ -498,7 +498,7 @@ export const allDiscussionWrappersExpanded = diff => {
       }
     });
   } else if (diff.highlighted_diff_lines) {
-    diff.parallel_diff_lines.forEach(line => {
+    diff.highlighted_diff_lines.forEach(line => {
       if (line.discussions.length) {
         discussionsExpandedArray.push(line.discussionsExpanded);
       }