Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/services/discussions/resolve_service.rb')
-rw-r--r--app/services/discussions/resolve_service.rb15
1 files changed, 13 insertions, 2 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index baf14aa8a03..54fc452ac85 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -17,7 +17,8 @@ module Discussions
def execute
discussions.each(&method(:resolve_discussion))
- process_auto_merge
+
+ after_resolve_cleanup
end
private
@@ -67,9 +68,19 @@ module Discussions
end
end
- def process_auto_merge
+ def after_resolve_cleanup
return unless merge_request
return unless @resolved_count > 0
+
+ send_graphql_triggers
+ process_auto_merge
+ end
+
+ def send_graphql_triggers
+ GraphqlTriggers.merge_request_merge_status_updated(merge_request)
+ end
+
+ def process_auto_merge
return unless discussions_ready_to_merge?
AutoMergeProcessWorker.perform_async(merge_request.id)