From 926cee002d701548b5344e0b93e95beb3802fd54 Mon Sep 17 00:00:00 2001
From: Gabriel Mazetto <gabriel@gitlab.com>
Date: Mon, 30 May 2016 18:13:42 -0300
Subject: Deduplicated resque.yml loading from several places

We will trust redis configuration params loading to Gitlab::RedisConfig.
---
 config/application.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'config/application.rb')

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
-- 
cgit v1.2.1