diff options
| author | Adam Niedzielski <adamsunday@gmail.com> | 2017-01-26 19:16:50 +0100 |
|---|---|---|
| committer | Adam Niedzielski <adamsunday@gmail.com> | 2017-02-06 11:49:30 +0100 |
| commit | 5d3816652e13cde6bf5e9de814d2c9d1e6593601 (patch) | |
| tree | f6137cb0baeb01330a1729d00c059988ced600ee /app/controllers/admin/application_settings_controller.rb | |
| parent | 572fb0be9b1d45437b7c0ed1000399657f471ec7 (diff) | |
| download | gitlab-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 'app/controllers/admin/application_settings_controller.rb')
| -rw-r--r-- | app/controllers/admin/application_settings_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb index 543d5eac504..3f10ae81767 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -137,6 +137,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :user_default_external, :user_oauth_applications, :version_check_enabled, + :terminal_max_session_time, disabled_oauth_sign_in_sources: [], import_sources: [], |