Improve messaging about why rebase button is missing

What does this MR do?

Add conflict message to clarify why rebase button is not offered.

Replaces gitlab-foss!29646 (closed)

Screenshots

Before After After ("Resolve conflicts" button is not available)
Screen_Shot_2020-01-09_at_4.01.37_PM Screen_Shot_2020-01-09_at_4.07.30_PM Screen_Shot_2020-01-09_at_4.07.59_PM

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 Ben Bodenmiller

Merge request reports

Loading