Commit 9cbf90dd authored by Evan Read's avatar Evan Read

Merge branch 'jlyttle-master-patch-88060' into 'master'

Modify the two_factor_authentication.md docs to be more specific regarding who can reset 2FA accounts

See merge request gitlab-org/gitlab!69762
parents 3798cbea 87d7ab9f
...@@ -377,7 +377,7 @@ have lost your code generation device) you can: ...@@ -377,7 +377,7 @@ have lost your code generation device) you can:
- [Use a saved recovery code](#use-a-saved-recovery-code). - [Use a saved recovery code](#use-a-saved-recovery-code).
- [Generate new recovery codes using SSH](#generate-new-recovery-codes-using-ssh). - [Generate new recovery codes using SSH](#generate-new-recovery-codes-using-ssh).
- [Regenerate 2FA recovery codes](#regenerate-2fa-recovery-codes). - [Regenerate 2FA recovery codes](#regenerate-2fa-recovery-codes).
- [Ask a GitLab administrator to disable two-factor authentication on your account](#ask-a-gitlab-administrator-to-disable-two-factor-authentication-on-your-account). - [Have 2FA disabled on your account](#have-2fa-disabled-on-your-account).
### Use a saved recovery code ### Use a saved recovery code
...@@ -454,12 +454,9 @@ To regenerate 2FA recovery codes, you need access to a desktop browser: ...@@ -454,12 +454,9 @@ To regenerate 2FA recovery codes, you need access to a desktop browser:
NOTE: NOTE:
If you regenerate 2FA recovery codes, save them. You can't use any previously created 2FA codes. If you regenerate 2FA recovery codes, save them. You can't use any previously created 2FA codes.
### Ask a GitLab administrator to disable two-factor authentication on your account ### Have 2FA disabled on your account
If you cannot use a saved recovery code or generate new recovery codes, ask a If you cannot use a saved recovery code or generate new recovery codes then please submit a [support ticket](https://support.gitlab.com/hc/en-us/requests/new) requesting that a GitLab global administrator disables two-factor authentication for your account. Please note that only the actual owner of the account can make this request and that disabling this setting will temporarily leave your account in a less secure state. You should therefore sign in and re-enable two-factor authentication as soon as possible.
GitLab global administrator to disable two-factor authentication for your
account. This temporarily leaves your account in a less secure state.
Sign in and re-enable two-factor authentication as soon as possible.
## Note to GitLab administrators ## Note to GitLab administrators
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment