diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 06:12:17 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-17 06:12:17 +0300 |
commit | d6f38acd8158768f6a8df6814c65ebbbbe2e0445 (patch) | |
tree | 6937c31ed1d0a3c6fa45470c5117d479b23be955 /app/services/auto_merge | |
parent | 77ed02d1fe93001f3649b878ddbe28697e77d5d9 (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 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/services/auto_merge/base_service.rb b/app/services/auto_merge/base_service.rb index 545e4d9b7dc..d0fde43138a 100644 --- a/app/services/auto_merge/base_service.rb +++ b/app/services/auto_merge/base_service.rb @@ -62,7 +62,7 @@ module AutoMerge merge_request.open? && !merge_request.broken? && (skip_draft_check(merge_request) || !merge_request.draft?) && - merge_request.mergeable_discussions_state? && + (skip_discussions_check(merge_request) || merge_request.mergeable_discussions_state?) && (skip_blocked_check(merge_request) || !merge_request.merge_blocked_by_other_mrs?) && yield end @@ -119,5 +119,10 @@ module AutoMerge def skip_blocked_check(merge_request) false end + + # Will skip the discussions check or not when checking if strategy is available + def skip_discussions_check(merge_request) + false + end end end |