Add latest changes from gitlab-org/gitlab@master

1 files changed, 0 insertions, 15 deletions

diff --git a/config/application.rb b/config/application.rb
index d0c211bf608..0752b6d15a3 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -17,10 +17,6 @@ module Gitlab
   class Application < Rails::Application
     require_dependency Rails.root.join('lib/gitlab')
     require_dependency Rails.root.join('lib/gitlab/utils')
-    require_dependency Rails.root.join('lib/gitlab/redis/wrapper')
-    require_dependency Rails.root.join('lib/gitlab/redis/cache')
-    require_dependency Rails.root.join('lib/gitlab/redis/queues')
-    require_dependency Rails.root.join('lib/gitlab/redis/shared_state')
     require_dependency Rails.root.join('lib/gitlab/current_settings')
     require_dependency Rails.root.join('lib/gitlab/middleware/read_only')
     require_dependency Rails.root.join('lib/gitlab/middleware/basic_health_check')
@@ -262,17 +258,6 @@ module Gitlab
       end
     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 = {}
-    caching_config_hash[:redis] = Gitlab::Redis::Cache.pool
-    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
-
-    config.cache_store = :redis_cache_store, caching_config_hash
-
     config.active_job.queue_adapter = :sidekiq
 
     # This is needed for gitlab-shell