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/application.rb | |
| 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/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 06ebb14a5fe..4a9ed41cbf8 100644 --- a/config/application.rb +++ b/config/application.rb @@ -107,7 +107,8 @@ module Gitlab end end - redis_config_hash = Gitlab::Redis.redis_store_options + # Use Redis caching across all environments + redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever config.cache_store = :redis_store, redis_config_hash |