"Remove group" text ambiguously suggests upcoming deletion

Summary

!75462 (diffs) introduced a little bug which causes confusion about the deletion status of a group.

The API output is clearer:

return error(_('Group has not been marked for deletion')) unless group.marked_for_deletion?

Steps to reproduce

Browse to any https://gitlab.com/groups/…/-/edit page > Advanced > Remove …

Example Project

What is the current bug behavior?

UI text implies upcoming deletion:

This group and its subgroups and projects will be placed in a 'pending deletion' state for %{deletion_adjourned_period} days, then permanently deleted on %{date}. The group can be fully restored before that date.
-- ee/app/views/groups/settings/_delayed_deletion.html.haml

What is the expected correct behavior?

Status should be clearer, like in the previous string:

Upon performing this action, the contents of this group, its subgroup and projects will be permanently deleted after %{deletion_adjourned_period} days on %{date}

Relevant logs and/or screenshots

See internal, customer-reported issue.

image

Output of checks

This bug happens on GitLab.com

Results of GitLab environment info
Results of GitLab application Check

Possible fixes

  1. Revert the string changes from !75462 (diffs)
  2. TBD
Edited by Christina Lohr