Merge branch...

Merge branch '121670-redis-cache-read-error-prevents-cas-users-from-remaining-signed-in' into 'master'

Set default reconnect_attempts of Rails.cache to 1

See merge request gitlab-org/gitlab!22704

changelogs/unreleased/121670-redis-cache-read-error-prevents-cas-users-from-remaining-signed-in.yml

+---
+title: Fix CAS users being signed out repeatedly
+merge_request: 22704
+author:
+type: fixed

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