Commit 99cd4191 authored by Douwe Maan's avatar Douwe Maan

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
parents 74fb5004 d83ce65c
...@@ -100,6 +100,9 @@ v 8.8.0 ...@@ -100,6 +100,9 @@ v 8.8.0
- Allows MR authors to have the source branch removed when merging the MR. !2801 (Jeroen Jacobs) - 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 - 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 v 8.7.6
- Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko) - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
- Fix import from GitLab.com to a private instance failure. !4181 - Fix import from GitLab.com to a private instance failure. !4181
......
...@@ -7,7 +7,7 @@ module Gitlab ...@@ -7,7 +7,7 @@ module Gitlab
end end
def initialize(url, credentials: nil) def initialize(url, credentials: nil)
@url = Addressable::URI.parse(URI.encode(url)) @url = Addressable::URI.parse(url)
@credentials = credentials @credentials = credentials
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment