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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index d8f696d247b..931d51c55d3 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -21,7 +21,8 @@ module Gitlab gravatar_enabled: Settings.gravatar['enabled'], sign_in_text: Settings.extra['sign_in_text'], restricted_visibility_levels: Settings.gitlab['restricted_visibility_levels'], - max_attachment_size: Settings.gitlab['max_attachment_size'] + max_attachment_size: Settings.gitlab['max_attachment_size'], + session_expire_delay: Settings.gitlab['session_expire_delay'] ) end end |