Enforce group approval settings in projects
What does this MR do?
This updates the project approval settings to show as locked when the group approval settings are enabled as descirbed in #332548 (closed).
The following changes are made:
- Consume the new projects endpoint when the development feature flag
group_merge_request_approval_settings_feature_flag
is enabled. - Rename
groupApprovalsMappers
tomergeRequestApprovalSettingsMappers
because it's now used by both projects & groups. - Add
lockedText
when a setting is enforced on a group-level.
There are no visual changes when the feature flag is disabled (off by default).
This MR targets the WIP backend !68476 (merged) branch 325620-group-to-project-mr-approval-settings
.
Screenshots or Screencasts (strongly suggested)
User projects
[GDK_HOST]/root/Typeahead.Js/edit
Before | After |
---|---|
![]() |
![]() |
Projects
[GDK_HOST]/gitlab-org/gitlab-shell/edit
No visual change unless group_merge_request_approval_settings_feature_flag
is enabled.
Before | After |
---|---|
![]() |
![]() |
Groups
Hidden behind a development feature flag group_merge_request_approval_settings_feature_flag
.
[GDK_HOST]/groups/gitlab-org/-/edit
Before | After |
---|---|
![]() |
![]() |
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
. - In Groups > Merge request approvals in
[GDK_HOST]/groups/gitlab-org/-/edit
:- Verify that the enabled instance setting is enforced
- Verify that approval settings can be changed & saved (refresh to be sure)
- In Project > Merge request approvals
[GDK_HOST]/gitlab-org/gitlab-shell/edit
:- Verify that the enabled instance setting is enforced
- Verify that approval settings can be changed & saved (refresh to be sure)
- In User Project > Merge request approvals
[GDK_HOST]/root/Typeahead.Js/edit
:- Verify that the enabled instance setting is enforced
- Verify that approval settings can be changed & saved (refresh to be sure)
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 #332548 (closed)