summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Penna <mpenna@gitlab.com>2019-07-19 22:35:55 +0000
committerMatt Penna <mpenna@gitlab.com>2019-07-19 22:35:55 +0000
commit2e64467e2f2edc1c55ff9a3156eda95d18ab2b59 (patch)
treebccd2525c14c5ee73375484638e205959418621a
parenta85a233ffc5a8a06de16fd2a52b3fdb039cfae5b (diff)
downloadgitlab-ce-2e64467e2f2edc1c55ff9a3156eda95d18ab2b59.tar.gz
Documented email confirmation signup restriction
-rw-r--r--doc/user/admin_area/settings/sign_up_restrictions.md20
1 files changed, 15 insertions, 5 deletions
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md
index d77e91156f8..42f50f968d5 100644
--- a/doc/user/admin_area/settings/sign_up_restrictions.md
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
@@ -4,19 +4,26 @@ type: reference
# Sign-up restrictions
-By implementing sign-up restrictions, you can blacklist or whitelist email addresses
-belonging to specific domains.
+You can use sign-up restrictions to require user email confirmation, as well as
+to blacklist or whitelist email addresses belonging to specific domains.
>**Note**: These restrictions are only applied during sign-up. An admin is
able to add a user through the admin panel with a disallowed domain. Also
note that the users can change their email addresses after signup to
disallowed domains.
+## 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.
+
+![Email confirmation](img/email_confirmation.png)
+
## Whitelist email domains
> [Introduced][ce-598] in GitLab 7.11.0
-You can restrict users to only signup using email addresses matching the given
+You can restrict users to only sign up using email addresses matching the given
domains list.
## Blacklist email domains
@@ -24,7 +31,9 @@ domains list.
> [Introduced][ce-5259] in GitLab 8.10.
With this feature enabled, you can block email addresses of a specific domain
-from creating an account on your GitLab server. This is particularly useful to prevent spam. Disposable email addresses are usually used by malicious users to create dummy accounts and spam issues.
+from creating an account on your GitLab server. This is particularly useful
+to prevent malicious users from creating spam accounts with disposable email
+addresses.
## Settings
@@ -35,7 +44,8 @@ To access this feature:
For the:
-- Blacklist, you can enter the list manually, or upload a `.txt` file with it.
+- Blacklist, you can enter the list manually, or upload a `.txt` file that contains
+list entries.
- Whitelist you must enter the list manually.
Both the whitelist and blacklist accept wildcards. For example, you can use