From e98d69bc8b8b926a727d36e37d2ee30c9fa28907 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 9 Jan 2020 21:07:48 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 config/application.rb | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'config/application.rb')

diff --git a/config/application.rb b/config/application.rb
index da674b2b944..f9cc1cb543a 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -261,6 +261,10 @@ module Gitlab
       caching_config_hash[:pool_timeout] = 1
     end
 
+    # Overrides RedisCacheStore's default value of 0
+    # This makes the default value the same with Gitlab::Redis::Cache
+    caching_config_hash[:reconnect_attempts] ||= ::Redis::Client::DEFAULTS[:reconnect_attempts]
+
     config.cache_store = :redis_cache_store, caching_config_hash
 
     config.active_job.queue_adapter = :sidekiq
-- 
cgit v1.2.3