diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-05-25 20:48:30 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-05-25 20:48:30 +0000 |
| commit | 99cd419132a7187973f92ab54dfbc94ad4b8c2e5 (patch) | |
| tree | f1b8a8108d2be07534db5297173865fc81e129f2 | |
| parent | 74fb50041568e381513d2a9053d31a714797a0a8 (diff) | |
| parent | d83ce65c1a0a8bcec603faf342cd2d78075ffb8d (diff) | |
| download | gitlab-ce-99cd419132a7187973f92ab54dfbc94ad4b8c2e5.tar.gz | |
Merge branch 'fix/import-url-uri-issue' into 'master'
Fix for import URL URI problem when URL contains a space
Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17559
Prevents an already encoded URL to be encoded again - preventing %20 => %25%20
See merge request !4180
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | lib/gitlab/url_sanitizer.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 030ac5e82a3..bb0c3d55de9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -100,6 +100,9 @@ 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 from GitLab.com to a private instance failure. !4181 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 |