diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-06 11:48:53 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2017-02-06 11:48:53 +0000 |
| commit | 999edc5c1783aa205fdac4ba159e51851acdb446 (patch) | |
| tree | a96ea40dd7b4ca60dab0d4c6869606ca10609729 /doc/api | |
| parent | dcf9af6c1258b438d91727e824589e52e43d344c (diff) | |
| parent | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (diff) | |
| download | gitlab-ce-999edc5c1783aa205fdac4ba159e51851acdb446.tar.gz | |
Merge branch 'terminal-max-session-time' into 'master'
Introduce maximum session time for terminal websocket connection
Closes #26263
See merge request !8413
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/settings.md | 7 |
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 } ``` |