Update the project approval settings section to Vue
What does this MR do?
This MR updates the project approval settings section to Vue and removes the old HAML view as described in #335964 (closed).
This MR also changes the following:
- Show the
ApprovalSettingCheckbox
as locked when a setting is enforced on by an administrator. - The approval settings form is now dynamic and no longer reloads the page on submission.
- Updates the setting copy and setting order to match group-level approval rules.
Setup & Testing
To test the approval settings:
- You need a GitLab Ultimate license.
- Checkout the feature branch.
- View the Approval settings under Merge request (MR) approvals
[GDK_HOST]/gitlab-org/gitlab-shell/edit
- Enable some of the settings.
- Test that the setting are enforced on one of the project's merge requests.
- Switch to main branch.
- View the Approval settings again and confirm that setting remain the same.
To test approval settings with enforcement:
- Enable the settings in Merge request (MR) approvals at
[GDK_HOST]/admin/push_rule#merge-request-approval-settings
- Confirm that the Approval settings are locked in
[GDK_HOST]/gitlab-org/gitlab-shell/edit
Screenshots or Screencasts (strongly suggested)
Before | After |
---|---|
![]() |
![]() |
Enforced
Before | After |
---|---|
![]() |
![]() |
Editing
Same as before, the button is only enabled on changes |
---|
![]() |
Saving
Alert is shown in the context |
---|
![]() |
Loading
Alert is shown in the context |
---|
![]() |
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 #335964 (closed)
Edited by Austin Regnery