Commit 09850321 authored by Marin Jankovski's avatar Marin Jankovski
Browse files

Also fallback to a default value if none is set.

parent 9595ec03
......@@ -3,9 +3,9 @@
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
......
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