diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-09 15:19:58 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2015-09-09 15:31:40 +0100 |
| commit | 0d66d4d342c72d141578d746aad766a6234fc872 (patch) | |
| tree | 2635d4e6259fa404cde9569eb60da3ceba9fa6d9 /config | |
| parent | 0d610270d9634b783137bc6318eff4aa82572a7d (diff) | |
| download | gitlab-ce-0d66d4d342c72d141578d746aad766a6234fc872.tar.gz | |
Fix reading session_expire_delay when application settings are not yet created and migrations are not yet done
Diffstat (limited to 'config')
| -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. |