summaryrefslogtreecommitdiff
path: root/app/services/discussions/resolve_service.rb
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/discussions/resolve_service.rb')
-rw-r--r--app/services/discussions/resolve_service.rb8
1 files changed, 1 insertions, 7 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 4a803b47bba..0437195f588 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -9,13 +9,7 @@ module Discussions
discussion.resolve!(current_user)
- notify_discussion_resolved(discussion)
- end
-
- def notify_discussion_resolved(discussion)
- noteable = merge_request || discussion.noteable
-
- MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(noteable)
+ MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request)
SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue
end