Skip to content

Enforce group approval settings in projects

Jiaan Louw requested to merge 332548-enforce-group-approval-settings into master

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 to mergeRequestApprovalSettingsMappers 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
image image

Projects

[GDK_HOST]/gitlab-org/gitlab-shell/edit

No visual change unless group_merge_request_approval_settings_feature_flag is enabled.

Before After
image image

Groups

Hidden behind a development feature flag group_merge_request_approval_settings_feature_flag.

[GDK_HOST]/groups/gitlab-org/-/edit

Before After
image image

How to setup and validate locally (strongly suggested)

  1. You need a GitLab Ultimate license.
  2. Enable the feature flag: echo "Feature.enable(:group_merge_request_approval_settings_feature_flag)" | rails c
  3. Enable an approval setting on instance level in [GDK_HOST]/admin/push_rule.
  4. 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)
  5. 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)
  6. 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

Availability and Testing

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)

Edited by Jiaan Louw

Merge request reports