Add latest changes from gitlab-org/gitlab@master

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 [];