Skip to content

Fix merge train merge failed when check_mergeability obtain lock error

What does this MR do and why?

related issues:

Add check_mergeability_retry_lease: true when calling MergeRequest#mergeable? in MergeService via merge trains

/cc @daveliu

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Edited by Linjie Zhang

Merge request reports