diff options
| author | Phil Hughes <me@iamphill.com> | 2019-04-23 07:45:39 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-04-23 07:45:39 +0000 |
| commit | f34582fe740f6a9e3a97c1d59ff921f2f8dfa926 (patch) | |
| tree | 6cfc289e6a2a1194ab97511e2154c05e5fd07ff4 | |
| parent | 68dbdca7f0e8647a15544208a2f78eda95429d80 (diff) | |
| parent | a773082e60b3b3adc9c54cabb16a4204edf32a6f (diff) | |
| download | gitlab-ce-f34582fe740f6a9e3a97c1d59ff921f2f8dfa926.tar.gz | |
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
| -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" > |