summaryrefslogtreecommitdiff
path: root/config/initializers/session_store.rb
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2015-11-24 12:11:31 +0100
committerMarin Jankovski <maxlazio@gmail.com>2015-11-24 12:11:31 +0100
commit9595ec036a0f6f0d2e18e47094431b5a1b6d427f (patch)
treedbceaf362b5b78eda39bdb82ca36c6a0d4af7a4a /config/initializers/session_store.rb
parent8c0f2acad9bd2552e4237f966aeb6d9df0f2fa75 (diff)
downloadgitlab-ce-9595ec036a0f6f0d2e18e47094431b5a1b6d427f.tar.gz
Maybe rescue session_expire_delay by setting a default value.
Diffstat (limited to 'config/initializers/session_store.rb')
-rw-r--r--config/initializers/session_store.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb
index d7c5432da76..eb534625e33 100644
--- a/config/initializers/session_store.rb
+++ b/config/initializers/session_store.rb
@@ -7,6 +7,7 @@ include Gitlab::CurrentSettings
begin
Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay
rescue
+ Settings.gitlab['session_expire_delay'] ||= 10080
end
unless Rails.env.test?