diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-06-10 13:44:45 +0200 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-06-10 13:44:45 +0200 |
| commit | 72647eda3121566c92941a1e98088c31a77cb9a5 (patch) | |
| tree | b2336b7727b025595c8a7daef59ff3c277fa49ce | |
| parent | cfc99bbd1390bc548a703fdc7857c7db5b0e7c13 (diff) | |
| download | gitlab-ce-72647eda3121566c92941a1e98088c31a77cb9a5.tar.gz | |
Don't require Gitlab::Redis in mail_room.yml if it's already defined
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | config/mail_room.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index 761a32adb9e..7cab24b295e 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -2,7 +2,7 @@ <% require "yaml" require "json" -require_relative "lib/gitlab/redis" +require_relative "lib/gitlab/redis" unless defined?(Gitlab::Redis) rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development" |