Skip to content

Update settings to match implementation

Alexander Turinske requested to merge 435725-update-group-branch-mod-setting into master

What does this MR do and why?

Update settings to match implementation

  • context
  • any group that has a security policy that has block_branch_modification: true has it's protected branches protected from modification
  • update 'block_branch_modification' humanized value to be more generic
  • update 'block_group_branch_modification' default setting to match behavior

Changelog: changed

EE: true

References

Please include cross links to any resources that are relevant to this MR This will give reviewers and future readers helpful context to give an efficient review of the changes introduced.

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.

  1. Upload a GitLab Ultimate license
  2. Enable the feature flag echo "Feature.enable(:scan_result_policy_block_group_branch_modification)" | rails c
  3. Navigate to a group => Secure => Policies => New policy => Merge request approval policy
  4. Verify the Block group branch modification setting shows and can be toggled and modified
  5. Add the Block branch modification and manually remove the Block group branch modification setting from the yaml
  6. Create the policy
  7. Navigate to a group => Secure => Policies => Select the new policy => Edit policy
  8. Verify the Block group branch modification setting checkbox is checked
  9. Remove the Block branch modification setting and ensure the Block group branch modification setting is not in the yaml
  10. Save the policy
  11. Navigate to a group => Secure => Policies => Select the new policy => Edit policy
  12. Verify the Block group branch modification setting checkbox is not checked
  13. Ensure both settings are in the yaml in whatever state
  14. Save the policy
  15. Navigate to a group => Secure => Policies => Select the new policy => Edit policy
  16. Verify the both settings checkbox is accurate to their yaml

Related to #435725

Merge request reports