diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-09-24 14:38:51 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-09-24 14:38:51 +0000 |
commit | 4007456808a9d18858b2c117b9cc6fee91d26ed6 (patch) | |
tree | f76686435113745ecce38325c94848f305c892f4 /app | |
parent | 842ed384075b74207d80a03565e71819fc61932b (diff) | |
parent | 370f07361c6d0fb1565003ae9427f69ad6004009 (diff) | |
download | gitlab-ce-4007456808a9d18858b2c117b9cc6fee91d26ed6.tar.gz |
Merge branch '24128-fix-comment-unresolve-discussions' into 'master'
Resolve "Resolved discussions automatically get unresolved when commented on"
Closes #24128
See merge request gitlab-org/gitlab-ce!21881
Diffstat (limited to 'app')
-rw-r--r-- | app/services/notes/build_service.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/notes/build_service.rb b/app/services/notes/build_service.rb index df5fe65de3c..7b92fe6fe14 100644 --- a/app/services/notes/build_service.rb +++ b/app/services/notes/build_service.rb @@ -3,6 +3,7 @@ module Notes class BuildService < ::BaseService def execute + should_resolve = false in_reply_to_discussion_id = params.delete(:in_reply_to_discussion_id) if in_reply_to_discussion_id.present? @@ -15,12 +16,17 @@ module Notes end params.merge!(discussion.reply_attributes) + should_resolve = discussion.resolved? end note = Note.new(params) note.project = project note.author = current_user + if should_resolve + note.resolve_without_save(current_user) + end + note end |