diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:09:11 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 18:09:11 +0300 |
| commit | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (patch) | |
| tree | fd70d5bc63fe152e0a67aaa5a70e4c9f16dc6ffc /doc/security | |
| parent | 5564275a0b378298dc6281599cbfe71a937109ff (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security')
| -rw-r--r-- | doc/security/password_length_limits.md | 4 | ||||
| -rw-r--r-- | doc/security/two_factor_authentication.md | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md index 8fc799faff0..d9df82cdcaf 100644 --- a/doc/security/password_length_limits.md +++ b/doc/security/password_length_limits.md @@ -12,7 +12,7 @@ By default, GitLab supports passwords with: GitLab administrators can modify password lengths: - Using configuration file. -- [From](https://gitlab.com/gitlab-org/gitlab/merge_requests/20661) GitLab 12.6, using the GitLab UI. +- [From](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20661) GitLab 12.6, using the GitLab UI. ## Modify maximum password length using configuration file @@ -44,7 +44,7 @@ From GitLab 12.6, the minimum password length set in this configuration file wil ## Modify minimum password length using GitLab UI -> [Introduced](https://gitlab.com/gitlab-org/gitlab/merge_requests/20661) in GitLab 12.6 +> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20661) in GitLab 12.6 The user password length is set to a minimum of 8 characters by default. To change that using GitLab UI: diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md index e51ef00a1fa..d9708a7b1c8 100644 --- a/doc/security/two_factor_authentication.md +++ b/doc/security/two_factor_authentication.md @@ -40,7 +40,7 @@ If you want to enforce 2FA only for certain groups, you can: To change this setting, you need to be administrator or owner of the group. -> [From](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24965) GitLab 12.0, 2FA settings for a group are also applied to subgroups. +> [From](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/24965) GitLab 12.0, 2FA settings for a group are also applied to subgroups. If you want to enforce 2FA only for certain groups, you can enable it in the group settings and specify a grace period as above. To change this setting you |