From f2f345e6048f80e4d6510db102cd046fca43d4e4 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 23 May 2016 09:05:01 +0200
Subject: [PATCH] avoid encoding import url and delegate good format to user
---
lib/gitlab/import_url.rb | 6 +-----
spec/lib/gitlab/import_url_spec.rb | 12 ------------
2 files changed, 1 insertion(+), 17 deletions(-)
diff --git a/lib/gitlab/import_url.rb b/lib/gitlab/import_url.rb
index f1191cc3a5..3cfbc17b89 100644
--- a/lib/gitlab/import_url.rb
+++ b/lib/gitlab/import_url.rb
@@ -1,7 +1,7 @@
module Gitlab
class ImportUrl
def initialize(url, credentials: nil)
- @url = URI.parse(encode(url))
+ @url = URI.parse(url)
@credentials = credentials
end
@@ -37,9 +37,5 @@ module Gitlab
def valid_credentials?
credentials && credentials.is_a?(Hash) && credentials.any?
end
-
- def encode(url)
- URI.decode(url).size < url.size ? url : URI.encode(url)
- end
end
end
diff --git a/spec/lib/gitlab/import_url_spec.rb b/spec/lib/gitlab/import_url_spec.rb
index 46029b121d..7948386b0e 100644
--- a/spec/lib/gitlab/import_url_spec.rb
+++ b/spec/lib/gitlab/import_url_spec.rb
@@ -19,16 +19,4 @@ describe Gitlab::ImportUrl do
describe 'credentials' do
it { expect(import_url.credentials).to eq(credentials) }
end
-
- context 'URL encoding' do
- describe 'not encoded URL' do
- let(:url) { "https://github.com/me/my project.git" }
- it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
- end
-
- describe 'already encoded URL' do
- let(:url) { "https://github.com/me/my%20project.git" }
- it { expect(import_url.sanitized_url).to eq("https://github.com/me/my%20project.git") }
- end
- end
end
--
2.30.9