gitlab merge button disabled after resolve conflicts

Summary

When creating a merge request and there're merge conflicts, there's the button "resolve conflicts" in the UI. This works fine, the message: "All merge conflicts were resolved." appears and the resolved commit is visible in the commit log. BUT The merge button still remains disabled! Only the button "merge locally" is clickable. The commit is NOT shown on the commits-tab on the merge request page. After committing another change, this merge resolving commit is suddenly shown in between. Additionally no CI pipline is triggered with the temporarily vanished merge resolving commit.

This behaviour is already described here: #22010 (closed)

Steps to reproduce

As described in the summary.

Example Project

What is the current bug behavior?

Button "Merge" is disabled and merge request is stuck.

What is the expected correct behavior?

Button "Merge" is clickable and the merge takes place.

Relevant logs and/or screenshots

image

Results of GitLab environment info

GitLab Enterprise Edition 14.0.0-pre 036f6944c83

Possible fixes

workaround: push another commit with a white-space change. This triggers the check for mergability and the button becomes clickable again. After clicking, the merge takes place and the CI pipeline is triggered as expected.

Edited by Martin Strese