diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 12:11:29 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-11 12:11:29 +0300 |
| commit | 289ce60cdc5fe83278ff01f9506db862e6f8e9ac (patch) | |
| tree | afd09e3f3c66e5583f646b6bf9fd351fd7f363f0 /app/models | |
| parent | fd92c8afee165b1da0f0d2386fdf4382bf6d7ab2 (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, 1 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 5629baa4f88..72b0632f9fd 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1257,7 +1257,6 @@ class MergeRequest < ApplicationRecord [ ::MergeRequests::Mergeability::CheckOpenStatusService, ::MergeRequests::Mergeability::CheckDraftStatusService, - ::MergeRequests::Mergeability::CheckNotPreparingService, ::MergeRequests::Mergeability::CheckBrokenStatusService, ::MergeRequests::Mergeability::CheckDiscussionsStatusService, ::MergeRequests::Mergeability::CheckCiStatusService @@ -1559,7 +1558,7 @@ class MergeRequest < ApplicationRecord def mergeable_ci_state? return true unless project.only_allow_merge_if_pipeline_succeeds?(inherit_group_setting: true) - return true unless actual_head_pipeline + return false 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? |