Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 0 deletions

diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 3aa6245b54d..946fb5f1372 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -7,6 +7,7 @@ module Discussions
     def initialize(project, user = nil, params = {})
       @discussions = Array.wrap(params.fetch(:one_or_more_discussions))
       @follow_up_issue = params[:follow_up_issue]
+      @resolved_count = 0
 
       raise ArgumentError, 'Discussions must be all for the same noteable' \
         unless noteable_is_same?
@@ -16,6 +17,7 @@ module Discussions
 
     def execute
       discussions.each(&method(:resolve_discussion))
+      process_auto_merge
     end
 
     private
@@ -36,6 +38,7 @@ module Discussions
       return unless discussion.can_resolve?(current_user)
 
       discussion.resolve!(current_user)
+      @resolved_count += 1
 
       MergeRequests::ResolvedDiscussionNotificationService.new(project, current_user).execute(merge_request) if merge_request
       SystemNoteService.discussion_continued_in_issue(discussion, project, current_user, follow_up_issue) if follow_up_issue
@@ -50,5 +53,17 @@ module Discussions
         first_discussion.noteable if first_discussion.for_merge_request?
       end
     end
+
+    def process_auto_merge
+      return unless merge_request
+      return unless @resolved_count.positive?
+      return unless discussions_ready_to_merge?
+
+      AutoMergeProcessWorker.perform_async(merge_request.id)
+    end
+
+    def discussions_ready_to_merge?
+      merge_request.auto_merge_enabled? && merge_request.mergeable_discussions_state?
+    end
   end
 end