summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 15:09:27 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-16 15:09:27 +0000
commit8d4aaa4dd07cd02383f7d09d74eb66ffe47a41c4 (patch)
tree684210b8b7c8b5664e8d7b529e59ffde6bcfaed4 /config
parentcbfe03ae04a52d9825ff7cbeccdfe5d313adf6a2 (diff)
downloadgitlab-ce-8d4aaa4dd07cd02383f7d09d74eb66ffe47a41c4.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/initializers/console_message.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/application.rb b/config/application.rb
index d0bb411c3cc..ab104a1d97b 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -258,7 +258,7 @@ module Gitlab
# 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[:compress] = Gitlab::Utils.to_boolean(ENV.fetch('ENABLE_REDIS_CACHE_COMPRESSION', '1'))
caching_config_hash[:namespace] = Gitlab::Redis::Cache::CACHE_NAMESPACE
caching_config_hash[:expires_in] = 2.weeks # Cache should not grow forever
if Gitlab::Runtime.multi_threaded?
diff --git a/config/initializers/console_message.rb b/config/initializers/console_message.rb
index 7272583f262..523a3898043 100644
--- a/config/initializers/console_message.rb
+++ b/config/initializers/console_message.rb
@@ -5,7 +5,7 @@ if Gitlab::Runtime.console?
puts '-' * 80
puts " GitLab:".ljust(justify) + "#{Gitlab::VERSION} (#{Gitlab.revision}) #{Gitlab.ee? ? 'EE' : 'FOSS'}"
- puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.new.version)}"
+ puts " GitLab Shell:".ljust(justify) + "#{Gitlab::VersionInfo.parse(Gitlab::Shell.version)}"
if Gitlab::Database.exists?
puts " #{Gitlab::Database.human_adapter_name}:".ljust(justify) + Gitlab::Database.version