Update settings to match implementation
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.
- Upload a GitLab Ultimate license
- Enable the feature flag
echo "Feature.enable(:scan_result_policy_block_group_branch_modification)" | rails c
- Navigate to a group => Secure => Policies => New policy => Merge request approval policy
- Verify the
Block group branch modification
setting shows and can be toggled and modified - Add the
Block branch modification
and manually remove theBlock group branch modification
setting from the yaml - Create the policy
- Navigate to a group => Secure => Policies => Select the new policy => Edit policy
- Verify the
Block group branch modification
setting checkbox is checked - Remove the
Block branch modification
setting and ensure theBlock group branch modification
setting is not in the yaml - Save the policy
- Navigate to a group => Secure => Policies => Select the new policy => Edit policy
- Verify the
Block group branch modification
setting checkbox is not checked - Ensure both settings are in the yaml in whatever state
- Save the policy
- Navigate to a group => Secure => Policies => Select the new policy => Edit policy
- Verify the both settings checkbox is accurate to their yaml
Related to #435725