Resolve EE / CE diff of noteable_discussion
What does this MR do?
It looks like a lot of effort has already been done to resolve the CE and EE differences of this component. The only thing missing was a small template update. This MR applies the difference.
git diff ce/master ee/master -- app/assets/javascripts/notes/components/noteable_discussion.vue
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"
>
Does this MR meet the acceptance criteria?
Conformity
Edited by Paul Slaughter