summaryrefslogtreecommitdiff
path: root/doc/user/profile/account
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2017-06-02 20:48:40 +0000
committerDouwe Maan <douwe@gitlab.com>2017-06-02 20:48:40 +0000
commit7cc734a2176e199d2e28ad8666e7e4e0030682db (patch)
tree8c5699cc243e3f4fd1448fb0e1f00020e100cfde /doc/user/profile/account
parent256a8601fb3e762193973afff25152dcdab9930c (diff)
parentc890c6aaf2939bc19292947bd8268d724fa7ddce (diff)
downloadgitlab-ce-7cc734a2176e199d2e28ad8666e7e4e0030682db.tar.gz
Merge branch '28694-hard-delete-user-from-api' into 'master'
Allow users to be hard-deleted from the API See merge request !11853
Diffstat (limited to 'doc/user/profile/account')
-rw-r--r--doc/user/profile/account/delete_account.md19
1 files changed, 14 insertions, 5 deletions
diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md
index a13c0458287..6e274a152e5 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -5,9 +5,13 @@
## Associated Records
-> Introduced for issues in [GitLab 9.0][ce-7393], and for merge requests, award emoji, notes, and abuse reports in [GitLab 9.1][ce-10467].
+> Introduced for issues in [GitLab 9.0][ce-7393], and for merge requests, award
+ emoji, notes, and abuse reports in [GitLab 9.1][ce-10467].
+ Hard deletion from abuse reports and spam logs was introduced in
+ [GitLab 9.1][ce-10273], and from the API in [GitLab 9.3][ce-11853].
-When a user account is deleted, not all associated records are deleted with it. Here's a list of things that will not be deleted:
+When a user account is deleted, not all associated records are deleted with it.
+Here's a list of things that will not be deleted:
- Issues that the user created
- Merge requests that the user created
@@ -15,11 +19,16 @@ When a user account is deleted, not all associated records are deleted with it.
- Abuse reports that the user reported
- Award emoji that the user created
+Instead of being deleted, these records will be moved to a system-wide
+"Ghost User", whose sole purpose is to act as a container for such records.
-Instead of being deleted, these records will be moved to a system-wide "Ghost User", whose sole purpose is to act as a container for such records.
-
+When a user is deleted from an abuse report or spam log, these associated
+records are not ghosted and will be removed, along with any groups the user
+is a sole owner of. Administrators can also request this behaviour when
+deleting users from the [API](../../../api/users.md#user-deletion)
[ce-7393]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7393
+[ce-10273]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10273
[ce-10467]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/10467
-
+[ce-11853]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11853