Merge branch 'master' into glitch-soc/merge-upstream

2020-02-29 12:20:54 +01:00
parent e1d29f7d9f 5393b187c4
commit 427ef4948a
4 changed files with 35 additions and 11 deletions
--- a/lib/mastodon/redis_config.rb
+++ b/lib/mastodon/redis_config.rb
@@ -14,7 +14,9 @@ def setup_redis_env_url(prefix = nil, defaults = true)
  ENV[prefix + 'REDIS_URL'] = if [password, host, port, db].all?(&:nil?)
                                ENV['REDIS_URL']
                              else
-                                "redis://#{password.blank? ? '' : ":#{password}@"}#{host}:#{port}/#{db}"
+                                Addressable::URI.parse("redis://#{host}:#{port}/#{db}").tap do |uri|
+                                  uri.password = password if password.present?
+                                end.normalize.to_str
                              end
 end