diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-09 17:16:46 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-09 17:16:46 +0300 |
| commit | c46e6eff104891ca4e404605ad3bf302a3aad9c7 (patch) | |
| tree | 36552d841679239cad915ddbb2e2721d89f8a962 /config/initializers/session_store.rb | |
| parent | 500337c4b23700a30876c6d2f8e7c612f8114432 (diff) | |
Parse config/resque.yml in one place only
Diffstat (limited to 'config/initializers/session_store.rb')
| -rw-r--r-- | config/initializers/session_store.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 0fc725842ba..3da5d46be92 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -13,9 +13,12 @@ end if Rails.env.test? Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session" else + redis_config = Gitlab::RedisConfig.redis_store_options + redis_config[:namespace] = 'session:gitlab' + Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. - servers: Rails.application.config.cache_store[1].merge(namespace: 'session:gitlab'), # re-use the Redis config from the Rails cache store + servers: redis_config, key: '_gitlab_session', secure: Gitlab.config.gitlab.https, httponly: true, |