Skip to content

Update Project deletion copy based on deletion mode

Aishwarya Subramanian requested to merge copy-update-proj-delete-modal into master

What does this MR do?

We changed the default mode of Project Deletion from Delayed Deletion to Delete Immediately in !35689 (merged). Group admins have an ability to toggle it in the Group Settings.

In addition, we also need to update the copy of the Delete modal to indicate whether the Project will be deleted with a delay or immediately (this can be retrieved from the Group's Setting for delayed_project_removal).

This MR updates the copy text based on the current configuration, the design will be updated in #220243 (closed).

Mentions #220382 (closed)

Feature flag removal

The feature flag configure_project_deletion_mode was introduced to ensure both the MRs are released to the users at the same time.

This MR removes the feature, since it is no longer needed with this merge.

Screenshots

Before (only delayed deletion mode)
Delete Section Delete Modal
Screen_Shot_2020-07-13_at_10.13.16_AM Screen_Shot_2020-07-13_at_10.13.25_AM
After (delayed deletion + delete immediately mode)
Mode Delete Section Delete Modal
Delayed Deletion Enabled_section Enabled_modal
Delete immediately Disabled_Section Disabled_modal

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 Aishwarya Subramanian

Merge request reports