summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2016-05-23 09:11:21 +0200
committerJames Lopez <james@jameslopez.es>2016-05-23 09:11:21 +0200
commitd83ce65c1a0a8bcec603faf342cd2d78075ffb8d (patch)
treee5d55844f118704dbd2edcfdf58cf7e3aa0376e3 /lib
parent6e3df42ca33e7fb6b8d79647fe99c5a6e8159484 (diff)
downloadgitlab-ce-d83ce65c1a0a8bcec603faf342cd2d78075ffb8d.tar.gz
fix changelog and mergefix/import-url-uri-issue
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 c59d53b941a..7d02fe3c971 100644
--- a/lib/gitlab/url_sanitizer.rb
+++ b/lib/gitlab/url_sanitizer.rb
@@ -7,7 +7,7 @@ module Gitlab
end
def initialize(url, credentials: nil)
- @url = Addressable::URI.parse(URI.encode(url))
+ @url = Addressable::URI.parse(url)
@credentials = credentials
end