diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-05-30 18:13:42 -0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-08-04 18:55:37 +0200 |
| commit | 926cee002d701548b5344e0b93e95beb3802fd54 (patch) | |
| tree | 41530bd8f003cca902724a48f8a3b10eb2a91303 /config/initializers | |
| parent | 96abb19206c6910c8c25f1db77c663baff023d35 (diff) | |
| download | gitlab-ce-926cee002d701548b5344e0b93e95beb3802fd54.tar.gz | |
Deduplicated resque.yml loading from several places
We will trust redis configuration params loading to Gitlab::RedisConfig.
Diffstat (limited to 'config/initializers')
| -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 0d9d87bac00..70be2617cab 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -13,9 +13,9 @@ end if Rails.env.test? Gitlab::Application.config.session_store :cookie_store, key: "_gitlab_session" else - redis_config = Gitlab::Redis.redis_store_options + redis_config = Gitlab::Redis.params redis_config[:namespace] = Gitlab::Redis::SESSION_NAMESPACE - + Gitlab::Application.config.session_store( :redis_store, # Using the cookie_store would enable session replay attacks. servers: redis_config, |