Commit 5288fbe4 authored by Robert Speicher's avatar Robert Speicher

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
parents 9a4ae859 09850321
......@@ -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?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment