diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:48 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-10 00:07:48 +0300 |
| commit | e98d69bc8b8b926a727d36e37d2ee30c9fa28907 (patch) | |
| tree | 1e86398c19b6ddd0602a99fb449cf75652ac62cf /config/application.rb | |
| parent | 007aba8b3b5583c5ef31670369f32f9f1f72555d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 4 insertions, 0 deletions
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 |