diff options
Diffstat (limited to 'app/services/auto_merge/base_service.rb')
| -rw-r--r-- | app/services/auto_merge/base_service.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb index 9e49bd86ec0..1660ddb934f 100644 --- a/app/services/auto_merge/base_service.rb +++ b/app/services/auto_merge/base_service.rb @@ -59,6 +59,7 @@ module AutoMerge !merge_request.broken? && !merge_request.draft? && merge_request.mergeable_discussions_state? && + !merge_request.merge_blocked_by_other_mrs? && yield end end |