diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 11:18:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-01-12 11:18:42 +0000 |
| commit | 50fff719fc148ac9f6f6a309770c6136a3aeb31b (patch) | |
| tree | 41b5b02207d66ef079b7b242b046822211c990d9 /doc/api | |
| parent | e798ee718312dbe7445ec9cf2e75045e8b2b3117 (diff) | |
| parent | f986b4c4e529f4c2518f0ce37dc9dfcaa2f073a0 (diff) | |
| download | gitlab-ce-20450-retry-build-button.tar.gz | |
Merge branch 'Sanson/gitlab-ce-asciidoctor-plantuml' into 'master'
20450-retry-build-button
Add support for PlantUML diagrams in Asciidoc.
Closes #17603
See merge request !8537
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/settings.md | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md index 0bd38a6e664..f86c7cc2f94 100644 --- a/doc/api/settings.md +++ b/doc/api/settings.md @@ -44,7 +44,9 @@ Example response: "repository_storage": "default", "repository_storages": ["default"], "koding_enabled": false, - "koding_url": null + "koding_url": null, + "plantuml_enabled": false, + "plantuml_url": null } ``` @@ -80,6 +82,8 @@ PUT /application/settings | `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. | | `disabled_oauth_sign_in_sources` | Array of strings | no | Disabled OAuth sign-in sources | +| `plantuml_enabled` | boolean | no | Enable PlantUML integration. Default is `false`. | +| `plantuml_url` | string | yes (if `plantuml_enabled` is `true`) | The PlantUML 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 @@ -112,6 +116,8 @@ Example response: "container_registry_token_expire_delay": 5, "repository_storage": "default", "koding_enabled": false, - "koding_url": null + "koding_url": null, + "plantuml_enabled": false, + "plantuml_url": null } ``` |