Skip to content

Updated the approvers rule removal modal

Robert Hunt requested to merge fix-remove-approval-button-type into master

What does this MR do?

While working in the approval rules area, I noticed the removal modal was rendering the button incorrectly.

This MR updates the removal button to use the new danger variant and make use of the new action-primary and action-cancel props. As well as removing the need for v-html by using GlSprintf instead.

Screenshots (strongly suggested)

Before After
image image

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

  1. Go to a projects settings
  2. Open the merge request approval rules area and if you don't have any set, create one
  3. Click the delete icon and check that the modal text is correct (singular for 1 approver, plural for multiple) and the remove button is using the danger variant (red)

Security

If this MR contains changes to processing or storing of credentials or tokens, authorization and authentication methods and other items described in the security review guidelines:

  • [-] 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
Edited by Andrew Fontaine

Merge request reports

Loading