diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-03 21:11:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-03 21:11:59 +0300 |
| commit | b9b477a3f1e64590e087cfe2cc21c9d5bd448756 (patch) | |
| tree | b42659fe7d1f05c4965994929a91b386ff827ff0 /app/services/auto_merge | |
| parent | 849c67f6da8d997d9fa54bba3526c64c7678aae6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/auto_merge')
| -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 |