Race condition between auto merge and suggestion being applied leads to merging before suggestion commit is merged

Describe the Bug

In certain cases, a MR with auto-merge enabled can be merged before all the required changes are merged.

• MR with auto merge enabled
• All approvers have approved
• CI is passing
• One thread is open with a suggestion

When I apply the suggestion, a new commit is created for the MR, however the MR gets merged (due to the thread being resolved) before the new commit is added to the MR.

This results to an unintended merge of code which was not clean enough to go in.

Desired State

Applied suggestion adds a new commit (triggering pipeline, reviewing, etc) before the thread is resolved.

What's my browser?

https://www.whatismybrowser.com/w/CHHJNJY

Page(s)

MR