diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-08 21:13:02 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-10-08 21:13:02 +0300 |
| commit | e7527f548681e4f9efd32f9c3da937ad74c68948 (patch) | |
| tree | ef51227ccbbeb1accc8e3886870dbc6a168e8bb8 /lib/gitlab/mail_room.rb | |
| parent | f2ac9ee99ac6b1afc0edbc8621a05176dddd6a14 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/mail_room.rb')
| -rw-r--r-- | lib/gitlab/mail_room.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/gitlab/mail_room.rb b/lib/gitlab/mail_room.rb index 0633efc6b0c..75d27ed8cc1 100644 --- a/lib/gitlab/mail_room.rb +++ b/lib/gitlab/mail_room.rb @@ -71,7 +71,8 @@ module Gitlab def redis_config gitlab_redis_queues = Gitlab::Redis::Queues.new(rails_env) - config = { redis_url: gitlab_redis_queues.url } + + config = { redis_url: gitlab_redis_queues.url, redis_db: gitlab_redis_queues.db } if gitlab_redis_queues.sentinels? config[:sentinels] = gitlab_redis_queues.sentinels |