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

Merge branch 'session_expire_delay_cannot_be_nil' into 'master'
5288fbe4 · Robert Speicher · 9a4ae859 · 09850321 · 5288fbe4
Commit 5288fbe4 authored Nov 25, 2015 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

session_store.rb config/initializers/session_store.rb +3 -2

No files found.
--- 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?