summaryrefslogtreecommitdiff
path: root/doc/api
diff options
context:
space:
mode:
authorAdam Niedzielski <adamsunday@gmail.com>2017-01-26 19:16:50 +0100
committerAdam Niedzielski <adamsunday@gmail.com>2017-02-06 11:49:30 +0100
commit5d3816652e13cde6bf5e9de814d2c9d1e6593601 (patch)
treef6137cb0baeb01330a1729d00c059988ced600ee /doc/api
parent572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff)
downloadgitlab-ce-5d3816652e13cde6bf5e9de814d2c9d1e6593601.tar.gz
Introduce maximum session time for terminal websocket connectionterminal-max-session-time
Store the value in application settings. Expose the value to Workhorse.
Diffstat (limited to 'doc/api')
-rw-r--r--doc/api/settings.md7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/api/settings.md b/doc/api/settings.md
index f86c7cc2f94..ca6b9347877 100644
--- a/doc/api/settings.md
+++ b/doc/api/settings.md
@@ -46,7 +46,8 @@ Example response:
"koding_enabled": false,
"koding_url": null,
"plantuml_enabled": false,
- "plantuml_url": null
+ "plantuml_url": null,
+ "terminal_max_session_time": 0
}
```
@@ -84,6 +85,7 @@ PUT /application/settings
| `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. |
+| `terminal_max_session_time` | integer | no | Maximum time for web terminal websocket connection (in seconds). Set to 0 for unlimited time. |
```bash
curl --request PUT --header "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/application/settings?signup_enabled=false&default_project_visibility=1
@@ -118,6 +120,7 @@ Example response:
"koding_enabled": false,
"koding_url": null,
"plantuml_enabled": false,
- "plantuml_url": null
+ "plantuml_url": null,
+ "terminal_max_session_time": 0
}
```