summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Read <eread@gitlab.com>2019-06-04 00:05:27 +0000
committerEvan Read <eread@gitlab.com>2019-06-04 00:05:27 +0000
commit3c06fd9c37af4597bb954c6eff38b604e70416d7 (patch)
treea2e5d454d5b18e0db0315c19e849762ddbfd89e0
parent327de6330364294a3ab0c3eac97d109744f7cfac (diff)
parent2f1a1226bef436b24a13f5a25a0b73b4fa4f9d11 (diff)
downloadgitlab-ce-3c06fd9c37af4597bb954c6eff38b604e70416d7.tar.gz
Merge branch 'docs/ssot_sign_up_restrictions' into 'master'
Edited signup restrictions for SSOT guidelines See merge request gitlab-org/gitlab-ce!29049
-rw-r--r--doc/user/admin_area/settings/sign_up_restrictions.md16
1 files changed, 16 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/sign_up_restrictions.md b/doc/user/admin_area/settings/sign_up_restrictions.md
index d3ecfd42903..cebf36c7ec1 100644
--- a/doc/user/admin_area/settings/sign_up_restrictions.md
+++ b/doc/user/admin_area/settings/sign_up_restrictions.md
@@ -1,3 +1,7 @@
+---
+type: reference
+---
+
# Sign-up restrictions
You can block email addresses of specific domains, or whitelist only some
@@ -37,5 +41,17 @@ semicolon, comma, or a new line.
![Domain Blacklist](img/domain_blacklist.png)
+<!-- ## Troubleshooting
+
+Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+one might have when setting this up, or when something is changed, or on upgrading, it's
+important to describe those, too. Think of things that may go wrong and include them here.
+This is important to minimize requests for support, and to avoid doc comments with
+questions that you know someone might ask.
+
+Each scenario can be a third-level heading, e.g. `### Getting error message X`.
+If you have none to add when creating a doc, leave this section in place
+but commented out to help encourage others to add to it in the future. -->
+
[ce-5259]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5259
[ce-598]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/598