diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 16:32:11 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-11 16:32:11 +0200 |
| commit | e3c30bf2e84462810bd8eff941681682a7ce6dc7 (patch) | |
| tree | b7755ec091db0a66292a19dc2a909bcfad4f67e9 /config | |
| parent | cd606e17907071af5ddf1d844deec0365c254604 (diff) | |
| parent | 4f461fd45f65dbd6900088149b48649b27a7c2ce (diff) | |
| download | gitlab-ce-e3c30bf2e84462810bd8eff941681682a7ce6dc7.tar.gz | |
Merge branch 'master' into ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-g
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
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. |