diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 16:28:01 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-09 16:28:01 +0000 |
| commit | 1ba26b4d1b4b877a689d1371fd00b5295b6ca32e (patch) | |
| tree | dc15c5dabad033da45f7031c0ef73ceec22b5f7e | |
| parent | 0d41b2dd87accc26390f801f52e60e8d00cf9e2f (diff) | |
| parent | 0d66d4d342c72d141578d746aad766a6234fc872 (diff) | |
| download | gitlab-ce-1ba26b4d1b4b877a689d1371fd00b5295b6ca32e.tar.gz | |
Merge branch 'redis-session-expire-delay' into 'master'
Fix reading session_expire_delay
The error occurs when application settings are not yet created and migrations are not yet done.
See merge request !1268
| -rw-r--r-- | config/initializers/session_store.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 6d274cd95a1..88651394d1d 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,7 +2,12 @@ require 'gitlab/current_settings' include Gitlab::CurrentSettings -Settings.gitlab['session_expire_delay'] = current_application_settings.session_expire_delay + +# allow it to fail: it may to 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 +rescue +end Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. |