Skip to content

make MR mergeable if project has pipelines disabled

Fabio Pitino requested to merge dont-lock-mr-if-pipelines-disabled into master

What does this MR do?

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/57291.

Before: given a failing/canceled pipeline, if pipelines are disabled AND only_allow_merge_if_pipeline_succeeds=true, the "Merge" button is disabled

Now: given a failing/canceled pipeline, if pipelines are disabled the "Merge" button is enabled, regardless of the only_allow_merge_if_pipeline_succeeds settings.

Does this MR meet the acceptance criteria?

Conformity

Performance 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

Merge request reports