diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-01-26 21:16:50 +0300 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-02-06 13:49:30 +0300 |
| commit | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (patch) | |
| tree | f6137cb0baeb01330a1729d00c059988ced600ee /lib/gitlab/workhorse.rb | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
Introduce maximum session time for terminal websocket connection
Store the value in application settings.
Expose the value to Workhorse.
Diffstat (limited to 'lib/gitlab/workhorse.rb')
| -rw-r--r-- | lib/gitlab/workhorse.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/workhorse.rb b/lib/gitlab/workhorse.rb index a3b502ffd6a..c8872df8a93 100644 --- a/lib/gitlab/workhorse.rb +++ b/lib/gitlab/workhorse.rb @@ -107,7 +107,8 @@ module Gitlab 'Terminal' => { 'Subprotocols' => terminal[:subprotocols], 'Url' => terminal[:url], - 'Header' => terminal[:headers] + 'Header' => terminal[:headers], + 'MaxSessionTime' => terminal[:max_session_time], } } details['Terminal']['CAPem'] = terminal[:ca_pem] if terminal.has_key?(:ca_pem) |