Skip to content

Fix unfinished merge by Merge Train process

Furkan Ayhan requested to merge 217908-handle-git-errors into master

What does this MR do?

Related to: #217908 (closed)

This error causes merge trains to be stuck.

The fix here is to handle Gitlab::Git::CommandError for Branches::DeleteService.

This solution is an outcome of our call with Shinya.


Sentry issue for this: https://sentry.gitlab.net/gitlab/gitlabcom/issues/1789659

Inspired by: @dosuken123 - #217908 (comment 405721252)

Inspired by: @dosuken123 - d5b0c7e3


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
Edited by Furkan Ayhan

Merge request reports