summaryrefslogtreecommitdiff
path: root/doc/api/settings.md
diff options
context:
space:
mode:
authorDennis Tang <dtang@gitlab.com>2018-05-11 18:42:20 +0200
committerDennis Tang <dtang@gitlab.com>2018-05-11 18:42:20 +0200
commit2205ed4f07265a43d2561ab2657557e317e7b9c0 (patch)
tree08e8373f874b59e78d97dd87b1c687d3458823d9 /doc/api/settings.md
parent3a3f4a348be936abde6881fc3909026932bf97ab (diff)
parentf4e234d92a2ff31dc681d56b52e9fbbbe3f931b1 (diff)
downloadgitlab-ce-2205ed4f07265a43d2561ab2657557e317e7b9c0.tar.gz
Merge remote-tracking branch 'origin/master' into 38759-fetch-available-parameters-directly-from-gke-when-creating-a-cluster
Diffstat (limited to 'doc/api/settings.md')
-rw-r--r--doc/api/settings.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 0b5b1f0c134..e06b1bfb6df 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -53,6 +53,8 @@ Example response:
"dsa_key_restriction": 0,
"ecdsa_key_restriction": 0,
"ed25519_key_restriction": 0,
+ "enforce_terms": true,
+ "terms": "Hello world!",
}
```
@@ -153,6 +155,8 @@ PUT /application/settings
| `user_default_external` | boolean | no | Newly registered users will by default be external |
| `user_oauth_applications` | boolean | no | Allow users to register any application to use GitLab as an OAuth provider |
| `version_check_enabled` | boolean | no | Let GitLab inform you when an update is available. |
+| `enforce_terms` | boolean | no | Enforce application ToS to all users |
+| `terms` | text | yes (if `enforce_terms` is true) | Markdown content for the ToS |
```bash
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/application/settings?signup_enabled=false&default_project_visibility=internal
@@ -195,5 +199,7 @@ Example response:
"dsa_key_restriction": 0,
"ecdsa_key_restriction": 0,
"ed25519_key_restriction": 0,
+ "enforce_terms": true,
+ "terms": "Hello world!",
}
```