Skip to content

Keep approvals when rebasing through the UI with reset approvals on push enabled

Description

Currently, reset approvals is predicated on three conditions:

  1. If approvals are not zero which was true in your previous merge request
  2. The option to reset approvals on push is enabled which is enabled
  3. The rebase_commit_sha value of the merge is not the same as the head SHA of the branch.

Based on those conditions, UI-triggered rebase cannot be distinguished from pushes. We want to keep approvals when triggering rebase through the UI

Links / references

ZD https://gitlab.zendesk.com/agent/tickets/95623 (internal)