kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Phil Hughes 2019-04-23 07:45:39 +00:00
parent 68dbdca7f0 a773082e60
commit f34582fe74
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/notes/components/noteable_discussion.vue
View File

@ -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"
>