summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Lopez <james@gitlab.com>2018-07-11 06:00:17 +0000
committerJames Lopez <james@gitlab.com>2018-07-11 06:00:17 +0000
commitc6b670216c6e011e0007a934decdc003a318405b (patch)
treed6e39949f8a929beaf7d325824835054440df619 /lib
parentc2a0a3ab1aed9814c1044c753b3f31b29b6142b1 (diff)
parent718a23fd36de971b3bd127c6f9d5311f7029e15c (diff)
downloadgitlab-ce-c6b670216c6e011e0007a934decdc003a318405b.tar.gz
Merge branch 'sh-handle-colons-in-url-passwords' into 'master'
Properly handle colons in URL passwords Closes #49080 See merge request gitlab-org/gitlab-ce!20538
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/url_sanitizer.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/url_sanitizer.rb b/lib/gitlab/url_sanitizer.rb
index 59331c827af..de8b6ec69ce 100644
--- a/lib/gitlab/url_sanitizer.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -58,7 +58,7 @@ module Gitlab
if raw_credentials.present?
url.sub!("#{raw_credentials}@", '')
- user, password = raw_credentials.split(':')
+ user, _, password = raw_credentials.partition(':')
@credentials ||= { user: user.presence, password: password.presence }
end