diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-08-12 17:23:19 -0500 |
| commit | c770201061c5d39e6e297951badfafc8ddf14906 (patch) | |
| tree | 72da00c88358d605f33c983945dd7e1565956c47 /config/application.rb | |
| parent | 9d9b7212bc5fe04e64a0a034a412f5d92cc96151 (diff) | |
| parent | 11eefba891f214eefc1efa334adbcc9e979c0ce3 (diff) | |
| download | gitlab-ce-c770201061c5d39e6e297951badfafc8ddf14906.tar.gz | |
Merge branch 'master' into diff-line-comment-vuejs
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 1646461939d..60a4e1f134e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -108,7 +108,8 @@ module Gitlab end end - redis_config_hash = Gitlab::Redis.redis_store_options + # Use Redis caching across all environments + redis_config_hash = Gitlab::Redis.params redis_config_hash[:namespace] = Gitlab::Redis::CACHE_NAMESPACE redis_config_hash[:expires_in] = 2.weeks # Cache should not grow forever config.cache_store = :redis_store, redis_config_hash |