diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 09:09:53 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-12 09:09:53 +0300 |
| commit | 90156f527b43a15e794c3351ecfc59aff42c440a (patch) | |
| tree | a59318246adf4297b3911f442b6a789fd38d35a6 /app/services/discussions/resolve_service.rb | |
| parent | 737684a392db1178770ad5b1d20b64386aadcac5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/discussions/resolve_service.rb')
| -rw-r--r-- | app/services/discussions/resolve_service.rb | 2 |
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) |