Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a2e9ad83
Commit
a2e9ad83
authored
Dec 14, 2018
by
Winnie Hellmann
Committed by
Fatih Acet
Dec 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Display reply field if resolved discussion has no replies
parent
e8a7836c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
1 deletion
+16
-1
app/assets/javascripts/notes/components/noteable_discussion.vue
...sets/javascripts/notes/components/noteable_discussion.vue
+1
-1
changelogs/unreleased/winh-resolved-discussions-reply-field.yml
...logs/unreleased/winh-resolved-discussions-reply-field.yml
+5
-0
spec/support/features/discussion_comments_shared_example.rb
spec/support/features/discussion_comments_shared_example.rb
+10
-0
No files found.
app/assets/javascripts/notes/components/noteable_discussion.vue
View file @
a2e9ad83
...
...
@@ -413,7 +413,7 @@ Please check your network connection and try again.`;
</
template
>
</ul>
<div
v-if=
"!isRepliesCollapsed"
v-if=
"!isRepliesCollapsed
|| !hasReplies
"
:class=
"{ 'is-replying': isReplying }"
class=
"discussion-reply-holder"
>
...
...
changelogs/unreleased/winh-resolved-discussions-reply-field.yml
0 → 100644
View file @
a2e9ad83
---
title
:
Display reply field if resolved discussion has no replies
merge_request
:
23801
author
:
type
:
fixed
spec/support/features/discussion_comments_shared_example.rb
View file @
a2e9ad83
...
...
@@ -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
(
: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
submit_reply
(
'a'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment