Allow auto merge on created and blocked pipelines
What does this MR do and why?
Enables the flag auto_merge_when_incomplete_pipeline_succeeds
by
default, resulting in the following changes:
Firstly, it fixes a bug where if merge trains were enabled, AND "Pipelines must succeed" was disabled, AND the head pipeline was blocked, then the default merge action was an immediate merge as opposed to "Add to merge train".
Secondly, when "Pipelines must succeed" is enabled, it makes it so that
merge requests with a blocked head pipeline (i.e. with status manual
and scheduled
) can be "Set to auto-merge" when the pipeline succeeds.
This is only made available when "Pipelines must succeed" is enabled,
because otherwise the pipeline does not block the merge, and immediate
merges are well established there as the default merge action.
- Feature issue: #334281
- Rollout issue: #454162 (closed)
MR acceptance checklist
Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.
Screenshots or screen recordings
Screenshots are required for UI changes, and strongly recommended for all other merge requests.
Before | After |
---|---|
How to set up and validate locally
Numbered steps to set up and validate the change are strongly suggested.