diff options
Diffstat (limited to 'app/services/auto_merge/base_service.rb')
| -rw-r--r-- | app/services/auto_merge/base_service.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb index 4ed4368d3b7..2a32f0c74ac 100644 --- a/app/services/auto_merge/base_service.rb +++ b/app/services/auto_merge/base_service.rb @@ -55,7 +55,10 @@ module AutoMerge def available_for?(merge_request) strong_memoize("available_for_#{merge_request.id}") do merge_request.can_be_merged_by?(current_user) && - merge_request.mergeable_state?(skip_ci_check: true) && + merge_request.open? && + !merge_request.broken? && + !merge_request.draft? && + merge_request.mergeable_discussions_state? && yield end end |