Merge branch 'resolve-ee-ce-diff-of-noteable-discussion' into 'master'

Resolve EE / CE diff of noteable_discussion

See merge request gitlab-org/gitlab-ce!27562

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -454,8 +454,13 @@ Please check your network connection and try again.`;
                   </component>
                 </template>
               </ul>
+              <draft-note
+                v-if="showDraft(discussion.reply_id)"
+                :key="`draft_${discussion.id}`"
+                :draft="draftForDiscussion(discussion.reply_id)"
+              />
               <div
-                v-if="isExpanded || !hasReplies"
+                v-else-if="isExpanded || !hasReplies"
                 :class="{ 'is-replying': isReplying }"
                 class="discussion-reply-holder"
               >