diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 18:06:41 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-31 18:06:41 +0300 |
| commit | 083d64c6468a070ae7b0b406ead8d87da27d1d22 (patch) | |
| tree | ba92a9b5b6418f805ede9ef05b371d82d2c1d27d /config/application.rb | |
| parent | 0be510a49f6e4f8e27b19b707fd1dac61571f78f (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 5d7c52c5d81..894e107e7da 100644 --- a/config/application.rb +++ b/config/application.rb @@ -247,7 +247,10 @@ 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 @@ -255,7 +258,7 @@ module Gitlab caching_config_hash[:pool_timeout] = 1 end - config.cache_store = :redis_store, caching_config_hash + config.cache_store = :redis_cache_store, caching_config_hash config.active_job.queue_adapter = :sidekiq |