diff options
| author | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-22 16:44:15 -0500 |
|---|---|---|
| committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-04-22 16:44:15 -0500 |
| commit | a773082e60b3b3adc9c54cabb16a4204edf32a6f (patch) | |
| tree | 2119e27879d25947f201d8d17eb5c0c6c8d46112 | |
| parent | 84a1e37f4a889c6b7558f101dc0ecf2932d0a0c6 (diff) | |
| download | gitlab-ce-resolve-ee-ce-diff-of-noteable-discussion.tar.gz | |
Resolve EE / CE diff of noteable_discussionresolve-ee-ce-diff-of-noteable-discussion
| -rw-r--r-- | app/assets/javascripts/notes/components/noteable_discussion.vue | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue index 89563711bcd..1e47bef7b61 100644 --- a/app/assets/javascripts/notes/components/noteable_discussion.vue +++ b/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" > |