diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 00:07:43 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-16 00:07:43 +0300 |
| commit | 9fe33f71995d8e3e83f0a30cb776aaa4a3ab4d70 (patch) | |
| tree | 06886785856aceff58cfce209679677a60f141f3 /doc | |
| parent | 2eafcb0673f7d501d9e3fabde6e950a5dcc24fc2 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/application_security/policies/scan-result-policies.md | 3 | ||||
| -rw-r--r-- | doc/user/profile/account/two_factor_authentication.md | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/user/application_security/policies/scan-result-policies.md b/doc/user/application_security/policies/scan-result-policies.md index 215604ff18d..6d6c8a03d55 100644 --- a/doc/user/application_security/policies/scan-result-policies.md +++ b/doc/user/application_security/policies/scan-result-policies.md @@ -40,6 +40,9 @@ before the policy changes take effect. The [policy editor](index.md#policy-editor) supports YAML mode and rule mode. +NOTE: +Propagating scan result policies created for groups with a large number of projects will take a while to complete. + ## Scan result policies schema The YAML file with scan result policies consists of an array of objects matching the scan result diff --git a/doc/user/profile/account/two_factor_authentication.md b/doc/user/profile/account/two_factor_authentication.md index 3dc768f6606..39826bf59c4 100644 --- a/doc/user/profile/account/two_factor_authentication.md +++ b/doc/user/profile/account/two_factor_authentication.md @@ -61,7 +61,6 @@ To enable 2FA with a one-time password: 1. Install a compatible application. For example: - Cloud-based (recommended because you can restore access if you lose the hardware device): - [Authy](https://authy.com/) - - [Duo Mobile](https://duo.com/product/multi-factor-authentication-mfa/duo-mobile-app) - Other: - [Google Authenticator](https://support.google.com/accounts/answer/1066447?hl=en) - [Microsoft Authenticator](https://www.microsoft.com/en-us/security/mobile-authenticator-app) @@ -73,6 +72,9 @@ To enable 2FA with a one-time password: 1. Enter your current password. 1. Select **Submit**. +NOTE: +DUO [cannot be used for 2FA](https://gitlab.com/gitlab-org/gitlab/-/issues/15760). + If you entered the correct pin, GitLab displays a list of [recovery codes](#recovery-codes). Download them and keep them in a safe place. |