diff options
| author | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-25 16:50:41 +0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-10-26 06:02:47 +0300 |
| commit | f9126fbe0a73aa6d8d61be2eb249260fa29ac461 (patch) | |
| tree | 933146f3919db0197dc3e1b8103930fd0f585816 /lib/gitlab/mail_room.rb | |
| parent | ea8aa34b55f9029a823c6210258f8552fcaababe (diff) | |
Updated mail_room and added sentinel support to Reply by Email
Diffstat (limited to 'lib/gitlab/mail_room.rb')
| -rw-r--r-- | lib/gitlab/mail_room.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb index 12999a90a29..a5220d92312 100644 --- a/lib/gitlab/mail_room.rb +++ b/lib/gitlab/mail_room.rb @@ -33,7 +33,12 @@ module Gitlab config[:mailbox] = 'inbox' if config[:mailbox].nil? if config[:enabled] && config[:address] - config[:redis_url] = Gitlab::Redis.new(rails_env).url + gitlab_redis = Gitlab::Redis.new(rails_env) + config[:redis_url] = gitlab_redis.url + + if gitlab_redis.sentinels? + config[:sentinels] = gitlab_redis.sentinels + end end config |