diff options
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/store/actions.js | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue index 90f7fd22b5c..26417c350cb 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_comment_row.vue @@ -57,7 +57,9 @@ export default { ); }, showRightSideCommentForm() { - return this.line.right.type && this.diffLineCommentForms[this.rightLineCode]; + return ( + this.line.right && this.line.right.type && this.diffLineCommentForms[this.rightLineCode] + ); }, className() { return (this.left && this.line.left.discussions.length > 0) || diff --git a/app/assets/javascripts/diffs/store/actions.js b/app/assets/javascripts/diffs/store/actions.js index 365cf61d5eb..1838394422a 100644 --- a/app/assets/javascripts/diffs/store/actions.js +++ b/app/assets/javascripts/diffs/store/actions.js @@ -49,12 +49,14 @@ export const assignDiscussionsToDiff = ({ state }, allLineDiscussions) => { } } - const targetInlineLine = selectedFile.highlightedDiffLines.find( - line => line.lineCode === discussions[0].line_code, - ); + if (selectedFile.highlightedDiffLines) { + const targetInlineLine = selectedFile.highlightedDiffLines.find( + line => line.lineCode === discussions[0].line_code, + ); - if (targetInlineLine) { - Object.assign(targetInlineLine, { discussions }); + if (targetInlineLine) { + Object.assign(targetInlineLine, { discussions }); + } } } } |