Don't require Gitlab::Redis in mail_room.yml if it's already defined

Signed-off-by: Rémy Coutable <remy@rymai.me>

Don't require Gitlab::Redis in mail_room.yml if it's already defined
Signed-off-by: Rémy Coutable <remy@rymai.me>
72647eda · Rémy Coutable · cfc99bbd · 72647eda
Commit 72647eda authored Jun 10, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/mail_room.yml config/mail_room.yml +1 -1

No files found.
--- 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"