diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-03-16 18:10:03 +0100 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2016-04-04 17:00:09 +0200 |
| commit | 0163e27631fb993bd3541c09a95f0ef5e2026455 (patch) | |
| tree | b63cff41fe7d6e7433ecacfefd8be17e4fa29422 /config/mail_room.yml | |
| parent | ba7fcc9866588eb215fc69f5d8b73c77805e4eef (diff) | |
| download | gitlab-ce-0163e27631fb993bd3541c09a95f0ef5e2026455.tar.gz | |
Add Gitlab::Redis connection pool
Diffstat (limited to 'config/mail_room.yml')
| -rw-r--r-- | config/mail_room.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/mail_room.yml b/config/mail_room.yml index 60257329f3e..761a32adb9e 100644 --- a/config/mail_room.yml +++ b/config/mail_room.yml @@ -2,7 +2,7 @@ <% require "yaml" require "json" -require_relative "lib/gitlab/redis_config" +require_relative "lib/gitlab/redis" rails_env = ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development" @@ -18,7 +18,7 @@ if File.exists?(config_file) config['mailbox'] = "inbox" if config['mailbox'].nil? if config['enabled'] && config['address'] - redis_url = Gitlab::RedisConfig.new(rails_env).url + redis_url = Gitlab::Redis.new(rails_env).url %> - :host: <%= config['host'].to_json %> |