1 files changed, 24 insertions, 1 deletions

diff --git a/app/services/issues/base_service.rb b/app/services/issues/base_service.rb
index 35af867a098..3aa842eb9a8 100644
--- a/app/services/issues/base_service.rb
+++ b/app/services/issues/base_service.rb
@@ -1,11 +1,12 @@
 module Issues
   class BaseService < ::IssuableBaseService
-    attr_reader :merge_request_for_resolving_discussions
+    attr_reader :merge_request_for_resolving_discussions, :discussion_to_resolve
 
     def initialize(*args)
       super
 
       @merge_request_for_resolving_discussions ||= params.delete(:merge_request_for_resolving_discussions)
+      @discussion_to_resolve ||= params.delete(:discussion_to_resolve)
     end
 
     def hook_data(issue, action)
@@ -15,6 +16,28 @@ module Issues
       issue_data
     end
 
+    def merge_request_for_resolving_discussions
+      @merge_request_for_resolving_discussions ||= discussion_to_resolve.try(:noteable)
+    end
+
+    def for_all_discussions_in_a_merge_request?
+      discussion_to_resolve.nil? && merge_request_for_resolving_discussions
+    end
+
+    def for_single_discussion?
+      discussion_to_resolve && discussion_to_resolve.noteable == merge_request_for_resolving_discussions
+    end
+
+    def discussions_to_resolve
+      @discussions_to_resolve ||= if for_all_discussions_in_a_merge_request?
+                                    merge_request_for_resolving_discussions.resolvable_discussions
+                                  elsif for_single_discussion?
+                                    Array(discussion_to_resolve)
+                                  else
+                                    []
+                                  end
+    end
+
     private
 
     def execute_hooks(issue, action = 'open')