Skip to content

Abort only MWPS when FF only merge is impossible

Marius Bobin requested to merge do-not-abort-merge-trains-on-ff into master

What does this MR do?

Resolves: #34117 (closed)
For projects configured to do FF merges only, this will cancel auto merges when pushing changes to the target branch.
Types of auto merges it cancels:

  • Merge when pipeline succeeds

It no longer cancels Add to merge train when pipeline succeeds

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] Label as security and @ mention @gitlab-com/gl-security/appsec
  • [-] The MR includes necessary changes to maintain consistency between UI, API, email, or other methods
  • [-] Security reports checked/validated by a reviewer from the AppSec team
Edited by Marius Bobin

Merge request reports