smarkets / marge-bot

A merge-bot for GitLab
BSD 3-Clause "New" or "Revised" License
693 stars 136 forks source link

Fix rebasing through GitLab's api #348

Open kdsnice opened 2 years ago

kdsnice commented 2 years ago

Fixes race conditions by providing include_rebase_in_progress parameter as noted in https://github.com/smarkets/marge-bot/pull/160#issuecomment-763628397.
Also, prevents marge-bot to complain about someone skipping the queue on each merge request as noted in https://github.com/smarkets/marge-bot/pull/160#issuecomment-482013649 and in https://github.com/smarkets/marge-bot/issues/337