diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 06:08:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-01-27 06:08:58 +0000 |
| commit | c78a5f67d0bf347da8a486d72515478e20f15d6e (patch) | |
| tree | 414a2f66561d04e56143587891b8fac8ea9ca026 /app/assets/javascripts/diffs/components/diff_view.vue | |
| parent | 53e4185a6e266ac3ebb70663e9825c84b66f0b5e (diff) | |
| download | gitlab-ce-c78a5f67d0bf347da8a486d72515478e20f15d6e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs/components/diff_view.vue')
| -rw-r--r-- | app/assets/javascripts/diffs/components/diff_view.vue | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_view.vue b/app/assets/javascripts/diffs/components/diff_view.vue index e28d855ff45..33901a619e5 100644 --- a/app/assets/javascripts/diffs/components/diff_view.vue +++ b/app/assets/javascripts/diffs/components/diff_view.vue @@ -138,16 +138,26 @@ export default { :class="line.commentRowClasses" class="diff-grid-comments diff-tr notes_holder" > - <div v-if="line.left" :class="{ parallel: !inline }" class="diff-td notes-content old"> + <div + v-if="line.left || !inline" + :class="{ parallel: !inline }" + class="diff-td notes-content old" + > <diff-comment-cell + v-if="line.left && (line.left.renderDiscussion || line.left.hasCommentForm)" :line="line.left" :diff-file-hash="diffFile.file_hash" :help-page-path="helpPagePath" line-position="left" /> </div> - <div v-if="line.right" :class="{ parallel: !inline }" class="diff-td notes-content new"> + <div + v-if="line.right || !inline" + :class="{ parallel: !inline }" + class="diff-td notes-content new" + > <diff-comment-cell + v-if="line.right && (line.right.renderDiscussion || line.right.hasCommentForm)" :line="line.right" :diff-file-hash="diffFile.file_hash" :line-index="index" |