Skip to content

Resolve "[Feature flag] Rollout of `use_new_rule_finalize_approach`"

Marc Shaw requested to merge 427612-feature-flag-rollout-of-use_new_rule_finalize_approach into master

What does this MR do and why?

This feature flag has been turned on for nearly 3 weeks now.

By removing this feature flag, we save more information at the time of merge in regard to the approval state, this allows us to maintain the approval state post merge even if changes to the parent rules change.

To test:

  • Create a project rule with a rule that requires 0 approvals
  • Tick settings -> merge_requests -> approval settings -> Prevent editing approval rules in merge requests
  • Create MR
  • Approve
  • Merge
  • Change the project rule to require 1
  • Ensure the MR still contains the rule as being optional

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.

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

Before After

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

Related to #427612 (closed)

Edited by Marc Shaw

Merge request reports