diff options
author | Valery Sizov <vsv2711@gmail.com> | 2015-11-25 19:18:44 +0300 |
---|---|---|
committer | Valery Sizov <vsv2711@gmail.com> | 2015-11-25 19:18:44 +0300 |
commit | 40ff1318d29884e4d17e7e450d8a7633e5ac36a9 (patch) | |
tree | 80363a35c2bf62156678b351cbd0802021f9ba54 /config/initializers/session_store.rb | |
parent | 913b408c021d3a9e8b940f580e1e537ef6ed77fd (diff) |
Rails update to 4.2.4
Diffstat (limited to 'config/initializers/session_store.rb')
-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 f30178ff711..d5208b8c93e 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -13,11 +13,11 @@ end unless Rails.env.test? Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. - servers: Gitlab::Application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store + servers: Rails.application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store key: '_gitlab_session', secure: Gitlab.config.gitlab.https, httponly: true, expire_after: Settings.gitlab['session_expire_delay'] * 60, - path: (Gitlab::Application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root + path: (Rails.application.config.relative_url_root.nil?) ? '/' : Gitlab::Application.config.relative_url_root ) end |