From 224c2addde2cd37daba354cd47a655891387dbe8 Mon Sep 17 00:00:00 2001 From: Bob Van Landuyt Date: Tue, 7 Mar 2017 23:49:16 +0100 Subject: [PATCH] No need to look up the notable separately in the ResolveService The merge request will now always be there when the discussion was resolved by creating a new issue. --- app/services/discussions/resolve_service.rb | 8 +------- spec/services/discussions/resolve_service_spec.rb | 2 +- 2 files changed, 2 insertions(+), 8 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 diff --git a/spec/services/discussions/resolve_service_spec.rb b/spec/services/discussions/resolve_service_spec.rb index 5eb5b2b04d7..12c3cdf28c6 100644 --- a/spec/services/discussions/resolve_service_spec.rb +++ b/spec/services/discussions/resolve_service_spec.rb @@ -6,7 +6,7 @@ describe Discussions::ResolveService do let(:project) { merge_request.project } let(:merge_request) { discussion.noteable } let(:user) { create(:user) } - let(:service) { described_class.new(discussion.noteable.project, user) } + let(:service) { described_class.new(discussion.noteable.project, user, merge_request: merge_request) } before do project.team << [user, :master] -- GitLab