diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-29 06:13:40 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-29 06:13:40 +0300 |
| commit | 41310fed8a373f2869cdd5946605e28a977706f1 (patch) | |
| tree | 55390a2f6c782dec7363f13ade1c1c49a7163332 /app/models | |
| parent | 46f9d8c35974925bf3d01380e10dd920e6dcaaf3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1ff003e94b9..bdaf2191e59 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1253,6 +1253,7 @@ class MergeRequest < ApplicationRecord [ ::MergeRequests::Mergeability::CheckOpenStatusService, ::MergeRequests::Mergeability::CheckDraftStatusService, + ::MergeRequests::Mergeability::CheckNotPreparingService, ::MergeRequests::Mergeability::CheckBrokenStatusService, ::MergeRequests::Mergeability::CheckDiscussionsStatusService, ::MergeRequests::Mergeability::CheckCiStatusService @@ -1554,7 +1555,7 @@ class MergeRequest < ApplicationRecord def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds?(inherit_group_setting: true) - return false unless actual_head_pipeline + return true unless actual_head_pipeline return true if project.allow_merge_on_skipped_pipeline?(inherit_group_setting: true) && actual_head_pipeline.skipped? actual_head_pipeline.success? |