Skip to content

Replace bootstrap modal for delete branch modal [RUN ALL RSPEC] [RUN AS-IF-FOSS]

What does this MR do?

Adds a new component for delete branch confirmation modal, and a new component to open it.

Adds feature flag :delete_branch_confirmation_modals which when enabled:

  • Replaces both the bootstrap modal and the javascript alert window on the Branches page with the new vue GlModal component.

  • Replaces the delete branch icon buttons on the Branches page with newly added button components to open the new vue confirmation modal.

Related to #254257 (closed)

Related to epic &4386

Feature flag rollout issue: https://gitlab.com/gitlab-org/gitlab/-/issues/329052

Screenshots (strongly suggested)

before (regular branch) after (tooltip and confirmation)
before-regular-branch delete-tooltip-after
merged: before-unmerged-and-merged merged: merged-regular
unmerged: before-unmerged-and-merged unmerged: unmerged-regular
before (protected branch) after (tooltip and confirmation)
not allowed: before-protected-unallowed allowed: before-delete-protected-allowed merged: delete-protected-branch-before-no-warningunmerged: before-protected-unmerged not allowed: p-not-allowed allowed: p-allowed merged: merged-protected unmerged: unmerged-protected
before (default branch) after
default-branch-before there is no style on the GlToolTip directive when the GLButton is disabled 🤔 after-disable-tooltip-gl-hover

Does this MR meet the acceptance criteria?

Conformity

Availability and Testing

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

Related to #254257 (closed)

Edited by Jackie Fraser

Merge request reports

Loading