Skip to content

Update approval settings from boolean to object format

Jiaan Louw requested to merge 332548-update-approvals-to-use-objects into master

What does this MR do?

This MR updates the approval settings from boolean to object format to prepare for the backend changes in !68476 (merged).

The following changes were made:

  1. Mappers updated to output object format.
  2. The setting locked status is now consumed on all settings - so a 🔒 is now also rendered on group settings.
  3. The setting value is now 1-way binded on checkboxes and updated with the input event.

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

Before After
image image

Groups

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

Hidden behind a development feature flag group_merge_request_approval_settings_feature_flag.

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 group 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 group 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 group 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