Commit 1d0eadc4 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'winh-resolved-discussions-reply-field' into 'master'

Display reply field if resolved discussion has no replies

Closes #54330

See merge request gitlab-org/gitlab-ce!23801
parents e8a7836c a2e9ad83
...@@ -413,7 +413,7 @@ Please check your network connection and try again.`; ...@@ -413,7 +413,7 @@ Please check your network connection and try again.`;
</template> </template>
</ul> </ul>
<div <div
v-if="!isRepliesCollapsed" v-if="!isRepliesCollapsed || !hasReplies"
:class="{ 'is-replying': isReplying }" :class="{ 'is-replying': isReplying }"
class="discussion-reply-holder" class="discussion-reply-holder"
> >
......
---
title: Display reply field if resolved discussion has no replies
merge_request: 23801
author:
type: fixed
...@@ -178,6 +178,16 @@ shared_examples 'discussion comments' do |resource_name| ...@@ -178,6 +178,16 @@ shared_examples 'discussion comments' do |resource_name|
let(:note_id) { find("#{comments_selector} .note:first-child", match: :first)['data-note-id'] } let(:note_id) { find("#{comments_selector} .note:first-child", match: :first)['data-note-id'] }
let(:reply_id) { find("#{comments_selector} .note:last-child", match: :first)['data-note-id'] } let(:reply_id) { find("#{comments_selector} .note:last-child", match: :first)['data-note-id'] }
it 'can be replied to after resolving' do
click_button "Resolve discussion"
wait_for_requests
refresh
wait_for_requests
submit_reply('to reply or not reply')
end
it 'shows resolved discussion when toggled' do it 'shows resolved discussion when toggled' do
submit_reply('a') submit_reply('a')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment