diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-06-02 20:48:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-06-02 20:48:40 +0000 |
| commit | 7cc734a2176e199d2e28ad8666e7e4e0030682db (patch) | |
| tree | 8c5699cc243e3f4fd1448fb0e1f00020e100cfde /doc | |
| parent | 256a8601fb3e762193973afff25152dcdab9930c (diff) | |
| parent | c890c6aaf2939bc19292947bd8268d724fa7ddce (diff) | |
| download | gitlab-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')
| -rw-r--r-- | doc/api/users.md | 3 | ||||
| -rw-r--r-- | doc/user/profile/account/delete_account.md | 19 |
2 files changed, 17 insertions, 5 deletions
diff --git a/doc/api/users.md b/doc/api/users.md index 331f9a9b80b..7e118dcf4a9 100644 --- a/doc/api/users.md +++ b/doc/api/users.md @@ -300,6 +300,9 @@ DELETE /users/:id Parameters: - `id` (required) - The ID of the user +- `hard_delete` (optional) - If true, contributions that would usually be + [moved to the ghost user](../user/profile/account/delete_account.md#associated-records) + will be deleted instead, as well as groups owned solely by this user. ## User 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 |