From 5b829393a732143e31e2f9a62b6ca2cfb7ebb147 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 14 Jun 2021 21:10:22 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/discussions/resolve_service.rb | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'app/services/discussions') 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 -- cgit v1.2.1