diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-23 01:51:39 +0300 |
|---|---|---|
| committer | Mayra Cabrera <mcabrera@gitlab.com> | 2019-08-23 01:51:39 +0300 |
| commit | 8832aa9522476d9d244211856f4ac7fe545a0c97 (patch) | |
| tree | 74b574853b319eaf54d68641f37b6c080addde37 /config | |
| parent | 01696b9d7df0bcc4c453b5c109ba7f811cda4d2f (diff) | |
| parent | 6bda359b5aaedfcdfb4b426d7428f65fee57217d (diff) | |
Merge branch 'sh-revert-redis-cache-store' into 'master'
Fix "ERR value is not an integer or out of range" errors
Closes #66449
See merge request gitlab-org/gitlab-ce!32126
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/config/application.rb b/config/application.rb index 2554dd8cca2..294ed470298 100644 --- a/config/application.rb +++ b/config/application.rb @@ -241,10 +241,7 @@ module Gitlab end # Use caching across all environments - # Full list of options: - # https://api.rubyonrails.org/classes/ActiveSupport/Cache/RedisCacheStore.html#method-c-new caching_config_hash = Gitlab::Redis::Cache.params - caching_config_hash[:compress] = false caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever if Sidekiq.server? # threaded context @@ -252,7 +249,7 @@ module Gitlab caching_config_hash[:pool_timeout] = 1 end - config.cache_store = :redis_cache_store, caching_config_hash + config.cache_store = :redis_store, caching_config_hash config.active_job.queue_adapter = :sidekiq |