diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-17 09:09:43 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-17 09:09:43 +0000 |
commit | fe29f106cd41b3c57b0266f3de6470cffee587ea (patch) | |
tree | f8d9cbc771b4a642c2fe59929dd6cc07a922cadd /app/assets/javascripts/notes/components/noteable_note.vue | |
parent | 6110935892876a26d8dfcb919d8c955c92ecc1e5 (diff) | |
download | gitlab-ce-fe29f106cd41b3c57b0266f3de6470cffee587ea.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes/components/noteable_note.vue')
-rw-r--r-- | app/assets/javascripts/notes/components/noteable_note.vue | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue index 56d82597573..9bf8cffe940 100644 --- a/app/assets/javascripts/notes/components/noteable_note.vue +++ b/app/assets/javascripts/notes/components/noteable_note.vue @@ -147,10 +147,10 @@ export default { return getEndLineNumber(this.lineRange); }, showMultiLineComment() { - if (!this.glFeatures.multilineComments) return false; + if (!this.glFeatures.multilineComments || !this.discussionRoot) return false; if (this.isEditing) return true; - return this.line && this.discussionRoot && this.startLineNumber !== this.endLineNumber; + return this.line && this.startLineNumber !== this.endLineNumber; }, commentLineOptions() { if (!this.diffFile || !this.line) return []; |