diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-12 13:50:40 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-12 13:50:40 +0000 |
| commit | 9ea8dcb5e206bc9bf566ad2aebd167d20ec85531 (patch) | |
| tree | 5c476f2e359053169b17ee4c38f51876e3e4ed97 /app/controllers | |
| parent | c14de4fd28daf96ac01425f8c62e5acd15fe8e9f (diff) | |
| parent | 1d080f57454fda46eb60700a8693cb968e6d557f (diff) | |
| download | gitlab-ce-9ea8dcb5e206bc9bf566ad2aebd167d20ec85531.tar.gz | |
Merge branch 'feature-session-expire-seconds-ui' into 'master'
Add session expiration delay configuration through UI application
Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting)
Answers the following suggestions:
* http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable
* http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle
See merge request !774
Diffstat (limited to 'app/controllers')
| -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 a01e2a907d7..c7c643db401 100644 --- a/app/controllers/admin/application_settings_controller.rb +++ b/app/controllers/admin/application_settings_controller.rb @@ -40,6 +40,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController :home_page_url, :after_sign_out_path, :max_attachment_size, + :session_expire_delay, :default_project_visibility, :default_snippet_visibility, :restricted_signup_domains_raw, |