diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 00:07:52 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 00:07:52 +0000 |
commit | 4fe93274dec62ff7361a67be88e320131d66b788 (patch) | |
tree | 98ae79e3101ffd6569fc48bb4c7ad8808540ceb8 /doc/user/admin_area/settings/sign_up_restrictions.md | |
parent | bbaf2bb0438b1c71020d9d216feb528add225a7f (diff) | |
download | gitlab-ce-4fe93274dec62ff7361a67be88e320131d66b788.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings/sign_up_restrictions.md')
-rw-r--r-- | doc/user/admin_area/settings/sign_up_restrictions.md | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md index a7a6b0ecefd..6dbdf24d477 100644 --- a/doc/user/admin_area/settings/sign_up_restrictions.md +++ b/doc/user/admin_area/settings/sign_up_restrictions.md @@ -37,7 +37,12 @@ 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 before they are allowed to sign in. +their email address. If this setting is selected: + +- For GitLab 12.1 and earlier, the user is unable to sign in until they confirm their + email address. +- For GitLab 12.2 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. ![Email confirmation](img/email_confirmation_v12_7.png) |