Draft: Lock group & project approval settings when enforced
requested to merge 332549-332548-lock-approval-settings-when-enforced into 325620-group-to-project-mr-approval-settings
What does this MR do?
This updates both the group & project approval settings to show locked when it's been enforced on a group or instance level.
This MR is dependant on the WIP backend !68476 (merged).
Group issue: #332549 (closed)
Project issue: #332548 (closed)
Screenshots or Screencasts (strongly suggested)
Personal projects
Project settings
| Before | After |
|---|---|
 |
 |
Group settings
| Before | After |
|---|---|
 |
 |
Enforced settings for groups & projects
| Enforced by instance | Enforced by group |
|---|---|
 |
 |
How to setup and validate locally (strongly suggested)
- You need a GitLab Ultimate license.
- Enable the feature flag:
echo "Feature.enable(:group_merge_request_approval_settings_feature_flag)" | rails c - Enable an approval setting on instance level in
[GDK_HOST]/admin/push_rule. - Verify that the setting is locked in Merge request approvals in
[GDK_HOST]/groups/gitlab-org/-/edit. - Enable another approval setting that isn't locked in Merge request approvals in
[GDK_HOST]/groups/gitlab-org/-/edit. - Verify that the settings are locked in
[GDK_HOST]/gitlab-org/gitlab-shell/edit. - Open an MR in the project and verify that all settings are enforced.
Does this MR meet the acceptance criteria?
Conformity
-
I have included changelog trailers, or none are needed. (Does this MR need a changelog?) -
I have added/updated documentation, or it's not needed. (Is documentation required?) -
I have properly separated EE content from FOSS, or this MR is FOSS only. (Where should EE code go?) -
I have added information for database reviewers in the MR description, or it's not needed. (Does this MR have database related changes?) -
I have self-reviewed this MR per code review guidelines. -
This MR does not harm performance, or I have asked a reviewer to help assess the performance impact. (Merge request performance guidelines) -
I have followed the style guides. -
This change is backwards compatible across updates, or this does not apply.
Availability and Testing
-
I have added/updated tests following the Testing Guide, or it's not needed. (Consider all test levels. See the Test Planning Process.) -
I have tested this MR in all supported browsers, or it's not needed. -
I have informed the Infrastructure department of a default or new setting change per definition of done, or it's not needed.
Security
Does this MR contain changes to processing or storing of credentials or tokens, authorization and authentication methods or other items described in the security review guidelines? If not, then delete this Security section.
-
Label as security and @ mention @gitlab-com/gl-security/appsec -
The MR includes necessary changes to maintain consistency between UI, API, email, or other methods -
Security reports checked/validated by a reviewer from the AppSec team
Related to #332549 (closed)
Edited by Jiaan Louw