Commit fd9b6c51 authored by Marcel Amirault's avatar Marcel Amirault

Merge branch 'eread/fix-version-for-grace-period' into 'master'

Fix introduced version for email grace period feature

See merge request gitlab-org/gitlab!26857
parents 618935e8 3024533b
...@@ -7,9 +7,9 @@ type: howto ...@@ -7,9 +7,9 @@ type: howto
GitLab can be configured to require confirmation of a user's email address when 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 signs up. When this setting is enabled:
- For GitLab 12.1 and earlier, the user is unable to sign in until they confirm their - For GitLab 12.7 and earlier, the user is unable to sign in until they confirm their
email address. 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). - 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. After 30 days, they will be unable to log in and access GitLab features.
In **Admin Area > Settings** (`/admin/application_settings/general`), go to the section In **Admin Area > Settings** (`/admin/application_settings/general`), go to the section
......
...@@ -39,9 +39,9 @@ email domains to prevent malicious users from creating accounts. ...@@ -39,9 +39,9 @@ email domains to prevent malicious users from creating accounts.
You can send confirmation emails during sign-up and require that users confirm You can send confirmation emails during sign-up and require that users confirm
their email address. If this setting is selected: 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 - For GitLab 12.7 and earlier, the user is unable to sign in until they confirm their
email address. 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). - 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. After 30 days, they will be unable to log in and access GitLab features.
![Email confirmation](img/email_confirmation_v12_7.png) ![Email confirmation](img/email_confirmation_v12_7.png)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment