diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-17 19:07:37 +0000 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-09-17 19:07:37 +0000 |
| commit | b1436cccf1081bb5f0034e302b0fb9d0cdc8a443 (patch) | |
| tree | a30d192f1d744e820319cb3e4fe30bb6d542e2c9 | |
| parent | 2caa6f78b790ca2ed45be3fa9bd049773597dc73 (diff) | |
| parent | cd12d759582c45a1a41fe5733cc3358698916e07 (diff) | |
| download | gitlab-ce-b1436cccf1081bb5f0034e302b0fb9d0cdc8a443.tar.gz | |
Merge branch 'patch-3' into 'master'
docs: fix typo, it should refer to `domain_blacklist_enabled` setting
## What does this MR do?
fix the documentation
## Are there points in the code the reviewer needs to double check?
N/A
## Why was this MR needed?
typo fix
## What are the relevant issue numbers?
N/A
## Screenshots (if relevant)
N/A
## Does this MR meet the acceptance criteria?
yes, it's just a typo fix in the documentation without any code or business logic changes
See merge request !5899
| -rw-r--r-- | doc/api/settings.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index a76dad0ebd4..aaa2c99642b 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -67,7 +67,7 @@ PUT /application/settings | `default_snippet_visibility` | integer | no | What visibility level new snippets receive. Can take `0` _(Private)_, `1` _(Internal)_ and `2` _(Public)_ as a parameter. Default is `0`.| | `domain_whitelist` | array of strings | no | Force people to use only corporate emails for sign-up. Default is null, meaning there is no restriction. | | `domain_blacklist_enabled` | boolean | no | Enable/disable the `domain_blacklist` | -| `domain_blacklist` | array of strings | yes (if `domain_whitelist_enabled` is `true` | People trying to sign-up with emails from this domain will not be allowed to do so. | +| `domain_blacklist` | array of strings | yes (if `domain_blacklist_enabled` is `true`) | People trying to sign-up with emails from this domain will not be allowed to do so. | | `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider | | `after_sign_out_path` | string | no | Where to redirect users after logout | | `container_registry_token_expire_delay` | integer | no | Container Registry token duration in minutes | |