From 5a8431feceba47fd8e1804d9aa1b1730606b71d5 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 19 Nov 2019 22:11:55 +0000 Subject: Add latest changes from gitlab-org/gitlab@12-5-stable-ee --- config/application.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'config/application.rb') diff --git a/config/application.rb b/config/application.rb index 5d7c52c5d81..cad5c8bbe76 100644 --- a/config/application.rb +++ b/config/application.rb @@ -157,6 +157,8 @@ module Gitlab config.assets.paths << "#{config.root}/vendor/assets/fonts" config.assets.precompile << "print.css" + config.assets.precompile << "mailer.css" + config.assets.precompile << "mailer_client_specific.css" config.assets.precompile << "notify.css" config.assets.precompile << "mailers/*.css" config.assets.precompile << "page_bundles/ide.css" @@ -247,15 +249,18 @@ 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 - caching_config_hash[:pool_size] = Sidekiq.options[:concurrency] + 5 + if Sidekiq.server? || defined?(::Puma) # threaded context + caching_config_hash[:pool_size] = Gitlab::Redis::Cache.pool_size 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 -- cgit v1.2.3