diff options
| author | Gabriel Mazetto <brodock@gmail.com> | 2015-11-27 19:32:32 +0300 |
|---|---|---|
| committer | Gabriel Mazetto <gabriel@gitlab.com> | 2016-08-04 19:55:37 +0300 |
| commit | ef6043880ee492e6c8fd7672d0e36ca81a62cfc9 (patch) | |
| tree | ad4b3d2b1e92bae8bb563d459dc24c5b2691f3a4 /lib/gitlab/redis.rb | |
| parent | 926cee002d701548b5344e0b93e95beb3802fd54 (diff) | |
Specs for RedisConfig
Make sure :url is not present on RedisConfig.params after parsing
Diffstat (limited to 'lib/gitlab/redis.rb')
| -rw-r--r-- | lib/gitlab/redis.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index 8050b28f33a..8c277d97f1a 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -54,12 +54,12 @@ module Gitlab if redis_uri.scheme == 'unix' # Redis::Store does not handle Unix sockets well, so let's do it for them config[:path] = redis_uri.path - config.delete(:url) else redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(redis_uri) config.merge!(redis_hash) end + config.delete(:url) config end |