diff options
Diffstat (limited to 'doc/user/profile/account')
| -rw-r--r-- | doc/user/profile/account/delete_account.md | 12 | ||||
| -rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md index a33b6742d61..361353a0f8c 100644 --- a/doc/user/profile/account/delete_account.md +++ b/doc/user/profile/account/delete_account.md @@ -53,7 +53,7 @@ There are two options for deleting users: - **Delete user and contributions** When using the **Delete user** option, not all associated records are deleted with the user. -Here's a list of things that will **not** be deleted: +Here's a list of things that are **not** deleted: - Issues that the user created. - Merge requests that the user created. @@ -61,20 +61,20 @@ Here's a list of things that will **not** be deleted: - 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 +Instead of being deleted, these records are moved to a system-wide user with the username "Ghost User", whose sole purpose is to act as a container -for such records. Any commits made by a deleted user will still display the +for such records. Any commits made by a deleted user still display the username of the original user. When using the **Delete user and contributions** option, **all** associated records are removed. This includes all of the items mentioned above including issues, merge requests, notes/comments, and more. Consider -[blocking a user](../../admin_area/blocking_unblocking_users.md) +[blocking a user](../../admin_area/moderate_users.md#blocking-a-user) or using the **Delete user** option instead. -When a user is deleted from an [abuse report](../../admin_area/abuse_reports.md) +When a user is deleted from an [abuse report](../../admin_area/review_abuse_reports.md) or spam log, these associated -records are not ghosted and will be removed, along with any groups the user +records are not ghosted and are removed, along with any groups the user is a sole owner of. Administrators can also request this behavior when deleting users from the [API](../../../api/users.md#user-deletion) or the Admin Area. diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 23e5bf2d143..c763226015e 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -51,10 +51,11 @@ To enable 2FA: 1. Install a compatible application, like: - [Authy](https://authy.com/) - [Duo Mobile](https://duo.com/product/multi-factor-authentication-mfa/duo-mobile-app) - - [LastPass](https://lastpass.com/auth/) + - [LastPass Authenticator](https://lastpass.com/auth/) - [Authenticator](https://mattrubin.me/authenticator/) - [andOTP](https://github.com/andOTP/andOTP) - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en) + - [Microsoft Authenticator](https://www.microsoft.com/en-us/account/authenticator) - [SailOTP](https://openrepos.net/content/seiichiro0185/sailotp) 1. In the application, add a new entry in one of two ways: - Scan the code presented in GitLab with your device's camera to add the |