diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-10 15:08:59 +0300 |
| commit | 7351a484d79236b7e9d47c86f2fcc970b7ae10b0 (patch) | |
| tree | 651b5fca7ea0460e3ce7c687cfa9e3a3b37eefc8 /doc/security | |
| parent | b4ded0ba7b4d2cdbed5b1f331cf2083a25ee4d7c (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/security')
| -rw-r--r-- | doc/security/password_length_limits.md | 2 | ||||
| -rw-r--r-- | doc/security/ssh_keys_restrictions.md | 2 | ||||
| -rw-r--r-- | doc/security/two_factor_authentication.md | 3 | ||||
| -rw-r--r-- | doc/security/user_email_confirmation.md | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/doc/security/password_length_limits.md b/doc/security/password_length_limits.md index d9df82cdcaf..5354fe30082 100644 --- a/doc/security/password_length_limits.md +++ b/doc/security/password_length_limits.md @@ -49,7 +49,7 @@ From GitLab 12.6, the minimum password length set in this configuration file wil The user password length is set to a minimum of 8 characters by default. To change that using GitLab UI: -In **Admin Area > Settings** (`/admin/application_settings`), go to the section **Sign-up restrictions**. +In **Admin Area > Settings** (`/admin/application_settings/general`), go to the section **Sign-up restrictions**. [Minimum password length settings](../user/admin_area/img/minimum_password_length_settings_v12_6.png) diff --git a/doc/security/ssh_keys_restrictions.md b/doc/security/ssh_keys_restrictions.md index 176b09168c4..47eccf665d3 100644 --- a/doc/security/ssh_keys_restrictions.md +++ b/doc/security/ssh_keys_restrictions.md @@ -17,7 +17,7 @@ algorithms. GitLab allows you to restrict the allowed SSH key technology as well as specify the minimum key length for each technology. -In **Admin Area > Settings** (`/admin/application_settings`), expand the +In **Admin Area > Settings** (`/admin/application_settings/general`), expand the **Visibility and access controls** section:  diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md index d9708a7b1c8..9592ae3df88 100644 --- a/doc/security/two_factor_authentication.md +++ b/doc/security/two_factor_authentication.md @@ -25,7 +25,8 @@ won't be able to leave the 2FA configuration area at `/profile/two_factor_auth`. To enable 2FA for all users: -1. Navigate to **Admin Area > Settings > General** (`/admin/application_settings`). +1. Navigate to **Admin Area > Settings > General** + (`/admin/application_settings/general`). 1. Expand the **Sign-in restrictions** section, where you can configure both. If you want 2FA enforcement to take effect on next login, change the grace diff --git a/doc/security/user_email_confirmation.md b/doc/security/user_email_confirmation.md index 3abfbe96a59..a493b374d66 100644 --- a/doc/security/user_email_confirmation.md +++ b/doc/security/user_email_confirmation.md @@ -8,7 +8,7 @@ GitLab can be configured to require confirmation of a user's email address when the user signs up. When this setting is enabled, the user is unable to sign in until they confirm their email address. -In **Admin Area > Settings** (`/admin/application_settings`), go to the section +In **Admin Area > Settings** (`/admin/application_settings/general`), go to the section **Sign-up Restrictions** and look for the **Send confirmation email on sign-up** option. <!-- ## Troubleshooting |