Resolve conflicts feature does not reset approvals
Everyone can contribute. Help move this issue forward while earning points, leveling up and collecting rewards.
Summary
When clicking "Resolve conflicts" in the GitLab MR widget, the resulting commit does not update the qualified approvers on the MR.
Steps to reproduce
- Have user A and user B, and add them to a project
- Enable "Prevent approvals by users who add commits"
- Create an MR with conflicts, with all commits belonging to user A
- As user B, click the "Resolve conflicts" button and resolve conflicts in the GitLab UI
- Go back to the MR widget and see that user B can still approve the MR
- Push to the source branch as user A
- Refresh the MR as user B and see that you now cannot approve the MR
Example Project
What is the current bug behavior?
The "Resolve conflicts" button does not reset approvals
What is the expected correct behavior?
The "Resolve conflicts" button should reset approvals
Possible fixes
I don't think the approval rules are re-assessed unless there's a "push event" for the project on the source branch. When editing a file through an actual git push, through the web IDE, or via the simple "Edit" screen in GitLab, the change will result in a push event. But I've confirmed on my test instance that "Resolve conflicts" does not result in a push event, and will not update the list of committers that can't approve.
I have also confirmed that another "push event" on the source branch will cause the approvals to be re-evaluated. The committers will then be updated in the MR and even the user who only contributed via "Resolve conflicts" will no longer be able to approve.