From e696bdcdaa829abfa641b287bdc491db8a3620f6 Mon Sep 17 00:00:00 2001 From: Robert Speicher Date: Wed, 25 Nov 2015 02:27:27 +0000 Subject: [PATCH] Merge branch 'session_expire_delay_cannot_be_nil' into 'master' Maybe rescue session_expire_delay by setting a default value. Related to gitlab-org/omnibus-gitlab#956 See merge request !1880 --- config/initializers/session_store.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index d7c5432da7..f30178ff71 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -3,10 +3,11 @@ require 'gitlab/current_settings' include Gitlab::CurrentSettings -# allow it to fail: it may to do so when create_from_defaults is executed before migrations are actually done +# allow it to fail: it may do so when create_from_defaults is executed before migrations are actually done begin - Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay + Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay || 10080 rescue + Settings.gitlab['session_expire_delay'] ||= 10080 end unless Rails.env.test?