diff --git a/doc/api/groups.md b/doc/api/groups.md index 1c738a7f935db4c000ea88b9ff750c2ec844756a..486a717b4f805811c48e9a86674c07e58f31fe1d 100644 --- a/doc/api/groups.md +++ b/doc/api/groups.md @@ -1214,7 +1214,7 @@ curl --request PUT --header "PRIVATE-TOKEN: " "https://gitlab --data "avatar=" ``` -## Remove group +## Delete group > - Immediately deleting subgroups was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/360008) in GitLab 15.3 [with a flag](../administration/feature_flags.md) named `immediate_delete_subgroup_api`. Disabled by default. > - Immediately deleting subgroups was [enabled on GitLab.com and self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/368276) in GitLab 15.4. @@ -1226,7 +1226,7 @@ Only available to group owners and administrators. This endpoint: - On Premium and Ultimate tiers, marks the group for deletion. The deletion happens 7 days later by default, but you can change the retention period in the [instance settings](../administration/settings/visibility_and_access_controls.md#deletion-protection). -- On Free tier, removes the group immediately and queues a background job to delete all projects in the group. +- On Free tier, deletes the group immediately and queues a background job to delete all projects in the group. - Deletes a subgroup immediately if the subgroup is marked for deletion (GitLab 15.4 and later). The endpoint does not immediately delete top-level groups. ```plaintext @@ -1244,7 +1244,7 @@ Parameters: The response is `202 Accepted` if the user has authorization. NOTE: -A GitLab.com group can't be removed if it is linked to a subscription. To remove such a group, first [link the subscription](../subscriptions/gitlab_com/index.md#change-the-linked-namespace) with a different group. +A GitLab.com group can't be deleted if it is linked to a subscription. To delete such a group, first [link the subscription](../subscriptions/gitlab_com/index.md#change-the-linked-namespace) with a different group. ## Restore group marked for deletion @@ -1691,7 +1691,7 @@ PUT /groups/:id/hooks/:hook_id ### Delete group hook -Removes a hook from a group. This is an idempotent method and can be called multiple times. +Deletes a hook from a group. This is an idempotent method and can be called multiple times. Either the hook is available or not. ```plaintext diff --git a/doc/user/group/index.md b/doc/user/group/index.md index c93251e36309b4d37d0c1e077b55e316609b46b8..5c112a6a96f87cc283086e39a576462ff4ce356e 100644 --- a/doc/user/group/index.md +++ b/doc/user/group/index.md @@ -166,32 +166,32 @@ To leave a group: 1. On the group overview page, in the upper-right corner, select **Actions** (**{ellipsis_v})**. 1. Select **Leave group**, then **Leave group** again. -## Remove a group +## Delete a group > - Enabled delayed deletion by default and removed the option to delete immediately [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/393622) and [on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119606) in GitLab 16.0. -To remove a group and its contents: +To delete a group and its contents: 1. On the left sidebar, select **Search or go to** and find your group. 1. Select **Settings > General**. 1. Expand the **Advanced** section. -1. In the **Remove group** section, select **Remove group**. +1. In the **Delete group** section, select **Delete group**. 1. On the confirmation dialog, type the group name and select **Confirm**. -You can also remove a group from the groups dashboard: +You can also delete a group from the groups dashboard: 1. On the left sidebar, select **Search or go to**. 1. Select **View all my groups**. 1. Select (**{ellipsis_v}**) for the group you want to delete. 1. Select **Delete**. -1. In the **Remove group** section, select **Remove group**. +1. In the **Delete group** section, select **Delete group**. 1. On the confirmation dialog, type the group name and select **Confirm**. On GitLab [Premium](https://about.gitlab.com/pricing/premium/) and [Ultimate](https://about.gitlab.com/pricing/ultimate/), this action adds a background job to mark a group for deletion. By default, the job schedules the deletion seven days in the future. You can modify this retention period through the [instance settings](../../administration/settings/visibility_and_access_controls.md#deletion-protection). -If the user who sets up the deletion is removed from the group before the deletion happens, the job is cancelled, and the group is no longer scheduled for deletion. +If the user who set up the deletion is removed from the group before the deletion happens, the job is cancelled, and the group is no longer scheduled for deletion. -## Remove a group immediately +## Delete a group immediately DETAILS: **Tier:** Premium, Ultimate @@ -199,19 +199,19 @@ DETAILS: > - Enabled delayed deletion by default and removed the option to delete immediately [on GitLab.com](https://gitlab.com/gitlab-org/gitlab/-/issues/393622) and [on self-managed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/119606) in GitLab 16.0. -If you don't want to wait, you can remove a group immediately. +If you don't want to wait, you can delete a group immediately. Prerequisites: - You must have the Owner role for a group. -- You have [marked the group for deletion](#remove-a-group). +- You have [marked the group for deletion](#delete-a-group). -To immediately remove a group marked for deletion: +To immediately delete a group marked for deletion: 1. On the left sidebar, select **Search or go to** and find your group. 1. Select **Settings > General**. 1. Expand **Advanced**. -1. In the **Permanently remove group** section, select **Remove group**. +1. In the **Permanently delete group** section, select **Delete group**. 1. Confirm the action when asked to. This action deletes the group, its subgroups, projects, and all related resources, including issues and merge requests. diff --git a/ee/app/views/groups/settings/_delayed_deletion.html.haml b/ee/app/views/groups/settings/_delayed_deletion.html.haml index 67b8f5ace46cf25db8de8500ef6b2a9c8b84aaa0..f80e9ba8d8d7284d3997e17e031efc2128d33a4a 100644 --- a/ee/app/views/groups/settings/_delayed_deletion.html.haml +++ b/ee/app/views/groups/settings/_delayed_deletion.html.haml @@ -11,6 +11,6 @@ = form_tag(group, method: :delete, id: remove_form_id) do %p = html_escape(_("This group and its subgroups and projects will be placed in a 'pending deletion' state for %{deletion_delayed_period} days, then permanently deleted on %{date}. The group can be fully restored before that date.")) % { date: tag.strong(date), deletion_delayed_period: deletion_adjourned_period } - = link_to _('Learn more.'), help_page_path('user/group/index', anchor: 'remove-a-group'), target: '_blank', rel: 'noopener noreferrer' + = link_to _('Learn more.'), help_page_path('user/group/index', anchor: 'delete-a-group'), target: '_blank', rel: 'noopener noreferrer' = render 'groups/settings/remove_button', group: group, remove_form_id: remove_form_id