Skip to content

Resolve "Prevent accidental deletions via soft delete for groups" - UI changes (MR: 5/n)

What does this MR do?

For #33257 (closed)

MR 5/n

I am splitting this feature into multiple MRs.

This is the 5th MR which adds necessary changes to help perform

  1. Mark a group for soft-deletion via UI
  2. Restore an already soft-deleted group to original state via UI.
  3. Show "pending-delete" labels for groups that are marked for deletion.
  4. In group show page and the show pages of it's subgroups and projects, show notices about pending delete.

Screenshots

Remove group setting: Screenshot_2020-01-06_at_4.10.41_PM

Remove group confirmation: Screenshot_2020-01-06_at_4.09.47_PM

Redirected to group page with notice after confirming deletion:

Screenshot_2020-01-13_at_10.44.51_AM

Restore group setting: Screenshot_2020-01-06_at_12.28.46_PM

'pending delete' label on group tree page:

Screenshot_2020-01-06_at_12.34.44_PM

Screenshot_2020-01-06_at_12.35.58_PM

Group show page of a group that is scheduled for deletion (shows "This group, it's subgroups and projects has been scheduled for removal on (a date) label.):

Screenshot_2020-01-06_at_12.35.58_PM

Subgroup show page - when it's parent group has been marked for deletion (shows label about parent group's pending deletion):

Screenshot_2020-01-06_at_4.19.08_PM

Project show page - when it's parent group has been marked for deletion (shows label about parent group's pending deletion):

Screenshot_2020-01-06_at_4.19.27_PM

admin/groups page - shows badge for groups pending deletion:

Screenshot_2020-01-06_at_12.40.04_PM

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
Edited by Manoj M J

Merge request reports