diff options
| author | Marin Jankovski <maxlazio@gmail.com> | 2015-11-24 15:57:28 +0100 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-11-24 15:57:28 +0100 |
| commit | 0985032132a2dfa02f2968a3e959df8629b77b12 (patch) | |
| tree | 008bf693e74bef713621adca31d5ff867d6ce847 | |
| parent | 9595ec036a0f6f0d2e18e47094431b5a1b6d427f (diff) | |
| download | gitlab-ce-session_expire_delay_cannot_be_nil.tar.gz | |
Also fallback to a default value if none is set.session_expire_delay_cannot_be_nil
| -rw-r--r-- | config/initializers/session_store.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index eb534625e33..f30178ff711 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -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 |