diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2015-09-14 11:16:56 +0300 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2015-09-14 11:16:56 +0300 |
| commit | 25149ce47eae575b65eb9470d58ea4f71b3b2603 (patch) | |
| tree | 01183c76724971d239ea596bcc9bc6253fc74dd2 /config | |
| parent | ad5d2c3e78e56cb00f608020d1b3a7980f4ac6f4 (diff) | |
| parent | 15eeae5fa8f10442617d2edd8fc3d8f5b3f334db (diff) | |
| download | gitlab-ce-25149ce47eae575b65eb9470d58ea4f71b3b2603.tar.gz | |
Merge branch 'ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g' of gitlab.com:gitlab-org/gitlab-ce into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
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 c3bee1c7cec..04ed9e90df5 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. |