Skip to content

Skip requested changes check when setting MWCP

Patrick Bajao requested to merge pb-skip-requested-changes-check into master

What does this MR do and why?

Before this change, when MR is blocked because reviewer requested changes, the MR can't be set to MWCP because the requested changes check isn't skipped in that case. This results to merge action returning a status: "failed" response.

To fix this behavior, when MR is set to MWCP and additional_merge_when_checks_ready FF is enabled, we skip the requested changes check. This allows the MR to be set to MWCP even if the check isn't successful yet.

No changelog since this is dependent on 3 feature flags:

  • merge_when_checks_pass
  • additional_merge_when_checks_ready
  • mr_reviewer_requests_changes

MR acceptance checklist

Please evaluate this MR against the MR acceptance checklist. It helps you analyze changes to reduce risks in quality, performance, reliability, security, and maintainability.

How to set up and validate locally

Enable the following feature flags:

  • merge_when_checks_pass
  • additional_merge_when_checks_ready
  • mr_reviewer_requests_changes
  1. As author, assign a reviewer to a MR.
  2. As reviewer, request changes. MR is blocked to merge but MWCP button is shown (this is expected).
  3. As reviewer, set MR to MWCP. Success.
  4. As reviewer, bypass request changes check. I can see the warning state.
  5. As a reviewer, approve the MR. MR gets merged.

Merge request reports