summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-08-15 09:29:20 +0000
committerNick Thomas <nick@gitlab.com>2018-08-15 09:29:20 +0000
commit9b718a761f1601394c3a1e0a15c7855d7eec6ac3 (patch)
tree79e1e49fcc38c61b494e1ba431e83e021e91b8fd /doc/api
parentc87ca8322636db69b6f097336f163d0373bb415e (diff)
parentb6ba8cc696a45e58bde24a592a9c315a0eb16744 (diff)
downloadgitlab-ce-9b718a761f1601394c3a1e0a15c7855d7eec6ac3.tar.gz
Merge branch 'add-user_show_add_ssh_key_message-application-setting' into 'master'
Add a "user_show_add_ssh_key_message" application setting for use with SSH certificates Closes #49953 See merge request gitlab-org/gitlab-ce!21027
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/settings.md8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md
index 68fc56b1fa3..b480d62e16a 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -56,7 +56,8 @@ Example response:
"enforce_terms": true,
"terms": "Hello world!",
"performance_bar_allowed_group_id": 42,
- "instance_statistics_visibility_private": false
+ "instance_statistics_visibility_private": false,
+ "user_show_add_ssh_key_message": true
}
```
@@ -161,6 +162,8 @@ PUT /application/settings
| `enforce_terms` | boolean | no | Enforce application ToS to all users |
| `terms` | text | yes (if `enforce_terms` is true) | Markdown content for the ToS |
| `instance_statistics_visibility_private` | boolean | no | When set to `true` Instance statistics will only be available to admins |
+| `user_show_add_ssh_key_message` | boolean | no | When set to `false` disable the "You won't be able to pull or push
++project code via SSH" warning shown to users with no uploaded SSH key |
```bash
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v4/application/settings?signup_enabled=false&default_project_visibility=internal
@@ -206,6 +209,7 @@ Example response:
"enforce_terms": true,
"terms": "Hello world!",
"performance_bar_allowed_group_id": 42,
- "instance_statistics_visibility_private": false
+ "instance_statistics_visibility_private": false,
+ "user_show_add_ssh_key_message": true
}
```