An error occurred while fetching the assigned iteration of the selected issue.
Build Approvals hide rebase requirement notifications
If build approvals are enabled, they take precedence over the notification that a branch must be rebased before it can be merged. This seems backwards to me in the following use case:
Given:
- I have
Build Approvals
enabled - I have
Reset Approvals on push
enabled - I have a merge request against
master
which is one commit behind
Expected:
- When viewing the Merge request, I should see either:
- The
You need to rebase
notification - The MR approval button, with a note that I need to rebase
Actual:
- I see the MR approval button blocking the merge interface
- Once merged, I see an indication that I must rebase, with a rebase button
- I then see the approval button again as I have
pushed
the rebase to the branch.
Arguably if the UI is supporting automatic rebase, then there are no conflicts that need to be handled, so there is little concern, however it does mean that (to follow our internal guidelines) the MR must go back out for review for approval.