Skip to content

Remove the 'broken' mergeability check in favor of commits check

Marc Shaw requested to merge switch_broken_status into master

What does this MR do and why?

Previously we were using the broken method, and using this as a mergeability check, however broken checks for conflicts among other things, where we already had a conflict check. This change is removing the conflict part of the mergeability check, and just checking that commits/branch exists.

To Test:

  • Checkout the branch switch_broken_status
  • Feature.enable(:merge_blocked_component) - to turn on the merged blocked widget
  • Create an MR with a conflict
  • Ensure that there exists only one check that says Conflicts that fails, and the no commits passes.

Related to: gitlab-com/gl-infra/production#17480 (closed)

Edited by Marc Shaw

Merge request reports