diff options
| author | James Lopez <james@jameslopez.es> | 2016-05-23 09:11:21 +0200 |
|---|---|---|
| committer | James Lopez <james@jameslopez.es> | 2016-05-23 09:11:21 +0200 |
| commit | d83ce65c1a0a8bcec603faf342cd2d78075ffb8d (patch) | |
| tree | e5d55844f118704dbd2edcfdf58cf7e3aa0376e3 | |
| parent | 6e3df42ca33e7fb6b8d79647fe99c5a6e8159484 (diff) | |
| download | gitlab-ce-fix/import-url-uri-issue.tar.gz | |
fix changelog and mergefix/import-url-uri-issue
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | lib/gitlab/url_sanitizer.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 1c26692f3ab..21b383b200d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -83,9 +83,11 @@ v 8.8.0 - Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs) - When creating a .gitignore file a dropdown with templates will be provided +v 8.7.7 + - Fix import by `Any Git URL` broken if the URL contains a space + v 8.7.6 - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) - - Fix import by `Any Git URL` broken if the URL contains a space - Fix import from GitLab.com to a private instance failure. !4181 - Fix external imports not finding the import data. !4106 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 |