1 files changed, 7 insertions, 1 deletions

diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 0437195f588..4a803b47bba 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -9,7 +9,13 @@ module Discussions
 
       discussion.resolve!(current_user)
 
-      MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request)
+      notify_discussion_resolved(discussion)
+    end
+
+    def notify_discussion_resolved(discussion)
+      noteable = merge_request || discussion.noteable
+
+      MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(noteable)
       SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue
     end