From 73b4eecddecf1e86d5e0c26166e2027583b680cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila=20Santos?= <ruben@gitlab.com>
Date: Thu, 22 Sep 2016 00:08:08 +0000
Subject: Revert "Merge branch '22364-rails-cache-redis-connection-pool' into
 'master'"

This reverts merge request !6429
---
 config/application.rb | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'config/application.rb')

diff --git a/config/application.rb b/config/application.rb
index 8166b6003f6..4792f6670a8 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -116,10 +116,6 @@ module Gitlab
     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
-    if Sidekiq.server? # threaded context
-      redis_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5
-      redis_config_hash[:pool_timeout] = 1
-    end
     config.cache_store = :redis_store, redis_config_hash
 
     config.active_record.raise_in_transactional_callbacks = true
-- 
cgit v1.2.1