diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-07-27 23:55:23 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-07-27 23:55:23 +0000 |
| commit | 02b25598cbedaaec96d8c9e52de7f969a5eb71a1 (patch) | |
| tree | d98c0e2801ce52e502b2c3444a40958f09f5fc98 /doc | |
| parent | e6112b7fcf445ddd30dc37427b8bcde899c9efda (diff) | |
| parent | c11ed138a02d29230e192a064011347e93b7fb9f (diff) | |
| download | gitlab-ce-02b25598cbedaaec96d8c9e52de7f969a5eb71a1.tar.gz | |
Merge branch 'bvl-add-all-settings-to-api' into 'master'
Add all ApplicationSettings attributes to the API
See merge request !12851
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/settings.md | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 0b4cc98cea6..94a9f8265fb 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -42,7 +42,6 @@ Example response: "gravatar_enabled" : true, "sign_in_text" : null, "container_registry_token_expire_delay": 5, - "repository_storage": "default", "repository_storages": ["default"], "koding_enabled": false, "koding_url": null, @@ -81,7 +80,6 @@ PUT /application/settings | `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 | | `repository_storages` | array of strings | no | A list of names of enabled storage paths, taken from `gitlab.yml`. New projects will be created in one of these stores, chosen at random. | -| `repository_storage` | string | no | The first entry in `repository_storages`. Deprecated, but retained for compatibility reasons | | `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. | | `koding_enabled` | boolean | no | Enable Koding integration. Default is `false`. | | `koding_url` | string | yes (if `koding_enabled` is `true`) | The Koding instance URL for integration. | @@ -121,7 +119,7 @@ Example response: "user_oauth_applications": true, "after_sign_out_path": "", "container_registry_token_expire_delay": 5, - "repository_storage": "default", + "repository_storages": ["default"], "koding_enabled": false, "koding_url": null, "plantuml_enabled": false, |