diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 00:10:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-15 00:10:22 +0300 |
commit | 5b829393a732143e31e2f9a62b6ca2cfb7ebb147 (patch) | |
tree | 85260ce9fd49ea62df0cea5b750f8c0db1b5a082 /app/services/discussions | |
parent | f69bc1dab50e86440bb4ffdc507ca5efd94bf459 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/discussions')
-rw-r--r-- | app/services/discussions/resolve_service.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb index 3b733023eae..baf14aa8a03 100644 --- a/app/services/discussions/resolve_service.rb +++ b/app/services/discussions/resolve_service.rb @@ -47,9 +47,16 @@ module Discussions MergeRequests::ResolvedDiscussionNotificationService.new(project: project, current_user: current_user).execute(merge_request) end + resolve_user_todos_for(discussion) SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue end + def resolve_user_todos_for(discussion) + return unless discussion.for_design? + + TodoService.new.resolve_todos_for_target(discussion, current_user) + end + def first_discussion @first_discussion ||= discussions.first end |