diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-12 00:09:34 +0000 |
commit | 5781a4966047232d4725f9ee4769c4bd5aed9b26 (patch) | |
tree | 0ef2b81a40931ec51f8fdd5284ed9e47cf42a923 /doc/user/admin_area/settings | |
parent | 4d48b3cfcd74bcca0f0f305746f74cf7224dd78b (diff) | |
download | gitlab-ce-5781a4966047232d4725f9ee4769c4bd5aed9b26.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings')
-rw-r--r-- | doc/user/admin_area/settings/sign_up_restrictions.md | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index 590907e5bef..a7a6b0ecefd 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -37,12 +37,7 @@ email domains to prevent malicious users from creating accounts. ## Require email confirmation You can send confirmation emails during sign-up and require that users confirm -their email address. If this setting is selected: - -- For GitLab 12.7 and earlier, the user is unable to sign in until they confirm their - email address. -- For GitLab 12.8 and later, the user [has 30 days to confirm their email address](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/31245). - After 30 days, they will be unable to log in and access GitLab features. +their email address before they are allowed to sign in. ![Email confirmation](img/email_confirmation_v12_7.png) |