Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Maziade <eric.maziade@novisoft.com>2015-06-05 18:50:37 +0300
committerEric Maziade <eric.maziade@novisoft.com>2015-06-05 18:50:37 +0300
commit84a414fe534ebb60c8e7396c245486be521e2a11 (patch)
tree35880b0bf1bdd1ba5818bbea464e86c7391f2407 /lib/gitlab/current_settings.rb
parent971e57cffa6a89ebcd4da83efc4967f834f8f58b (diff)
Add session expiration delay configuration through UI application
settings
Diffstat (limited to 'lib/gitlab/current_settings.rb')
-rw-r--r--lib/gitlab/current_settings.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb
index d8f696d247b..56bb0736429 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_seconds: Settings.gitlab['session_expire_seconds']
)
end
end