Skip to content

Show more appropriate error message when merging fails

Patrick Bajao requested to merge 30141-merge-error-msg-update into master

What does this MR do?

Handle Gitlab::Git::CommandError and Gitlab::Git::CommitError exceptions and return a git specific error message.

If no exception occurred but the commit wasn't created or other exceptions was raised, show a generic failure message.

Screenshots (strongly suggested)

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

Related to #30141 (closed)

Edited by Patrick Bajao

Merge request reports