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.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/discussions/resolve_service.rb b/app/services/discussions/resolve_service.rb
index 946fb5f1372..cd5925cd9be 100644
--- a/app/services/discussions/resolve_service.rb
+++ b/app/services/discussions/resolve_service.rb
@@ -56,7 +56,7 @@ module Discussions
def process_auto_merge
return unless merge_request
- return unless @resolved_count.positive?
+ return unless @resolved_count > 0
return unless discussions_ready_to_merge?
AutoMergeProcessWorker.perform_async(merge_request.id)