diff options
| author | DJ Mountney <david@twkie.net> | 2016-09-27 17:56:02 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2016-09-29 09:12:52 -0700 |
| commit | 59157c0423d34c1f20c446548df540d103bda939 (patch) | |
| tree | b9f5fd7041f5edf915737007c43247e480e841ae /doc/api/settings.md | |
| parent | 33d1f5904ce94cf2295b94aba6099a502be4b852 (diff) | |
| download | gitlab-ce-59157c0423d34c1f20c446548df540d103bda939.tar.gz | |
Expose the Koding application settings in the APIkoding-setting-api
This will allow the Koding app to enable the integration itself once is has authorized an admin user using the application secrets.
Diffstat (limited to 'doc/api/settings.md')
| -rw-r--r-- | doc/api/settings.md | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index aaa2c99642b..f7ad3b4cc8e 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -41,7 +41,9 @@ Example response: "gravatar_enabled" : true, "sign_in_text" : null, "container_registry_token_expire_delay": 5, - "repository_storage": "default" + "repository_storage": "default", + "koding_enabled": false, + "koding_url": null } ``` @@ -72,7 +74,9 @@ 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_storage` | string | no | Storage path for new projects. The value should be the name of one of the repository storage paths defined in your gitlab.yml | -| `enabled_git_access_protocol` | string | no | Enabled protocols for Git access. Allowed values are: `ssh`, `http`, and `nil` to allow both protocols. +| `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. | ```bash curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/application/settings?signup_enabled=false&default_project_visibility=1 @@ -103,6 +107,8 @@ Example response: "user_oauth_applications": true, "after_sign_out_path": "", "container_registry_token_expire_delay": 5, - "repository_storage": "default" + "repository_storage": "default", + "koding_enabled": false, + "koding_url": null } ``` |