diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-24 17:05:39 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-26 19:42:48 +0800 |
commit | e042baebb81ebd2b60becd9bebd2d088881aeca4 (patch) | |
tree | 163e026b0ce083e27d0871c1cda44ff6a6897dc7 | |
parent | 99784d77978e7548f70fa8499c5c9931c507d6f4 (diff) | |
download | gitlab-ce-e042baebb81ebd2b60becd9bebd2d088881aeca4.tar.gz |
Eliminate the last warning for redis wrapper
-rw-r--r-- | config/application.rb | 1 | ||||
-rw-r--r-- | lib/gitlab/redis/cache.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 2067428ff62..751307de975 100644 --- a/config/application.rb +++ b/config/application.rb @@ -6,6 +6,7 @@ Bundler.require(:default, Rails.env) module Gitlab class Application < Rails::Application + 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') diff --git a/lib/gitlab/redis/cache.rb b/lib/gitlab/redis/cache.rb index 9bf019b72e6..a991933e910 100644 --- a/lib/gitlab/redis/cache.rb +++ b/lib/gitlab/redis/cache.rb @@ -1,5 +1,5 @@ # please require all dependencies below: -require_relative 'wrapper' unless defined?(::Gitlab::Redis::Wrapper) +require_relative 'wrapper' unless defined?(::Rails) && ::Rails.root.present? module Gitlab module Redis |