summaryrefslogtreecommitdiff
path: root/lib/gitlab/url_sanitizer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/url_sanitizer.rb')
-rw-r--r--lib/gitlab/url_sanitizer.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb
index fa40a8b678b..e3bf11b00b4 100644
--- a/lib/gitlab/url_sanitizer.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -71,7 +71,10 @@ module Gitlab
url.sub!("#{raw_credentials}@", '')
user, _, password = raw_credentials.partition(':')
- @credentials ||= { user: user.presence, password: password.presence }
+
+ @credentials ||= {}
+ @credentials[:user] = user.presence if @credentials[:user].blank?
+ @credentials[:password] = password.presence if @credentials[:password].blank?
end
url = Addressable::URI.parse(url)