Skip to content

Fixes merge button showing incorrectly

Phil Hughes requested to merge ph/207121/shaMismatchCanMerge into master

What does this MR do?

Fixes the merge button showing as enabled to users who can't merge when new changes are pushed to a merge request.

This was caused by us only checking isSHAMismatch for the shaMismatch state. We not check for canMerge as well to make sure this state will only be shown to users who can merge.

Screenshots

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

Closes #207121 (closed)

Merge request reports