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

Merge branch 'fix/import-url-uri-issue' into 'master'
99cd4191 · Douwe Maan · 74fb5004 · d83ce65c · 99cd4191 · 99cd4191
Commit 99cd4191 authored May 25, 2016 by Douwe Maan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

CHANGELOG CHANGELOG +3 -0

url_sanitizer.rb lib/gitlab/url_sanitizer.rb +1 -1

No files found.
--- 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

--- 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