fix for import URL URI problem when URL contains a space

lib/gitlab/import_url.rb

 module Gitlab
   class ImportUrl
     def initialize(url, credentials: nil)
-      @url = URI.parse(URI.encode(url))
+      @url = URI.parse(encode(url))
       @credentials = credentials
     end
 
@@ -37,5 +37,9 @@ 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

spec/lib/gitlab/import_url_spec.rb

@@ -3,19 +3,32 @@ require 'spec_helper'
 describe Gitlab::ImportUrl do
 
   let(:credentials) { { user: 'blah', password: 'password' } }
+  let(:url) { "https://github.com/me/project.git" }
   let(:import_url) do
-    Gitlab::ImportUrl.new("https://github.com/me/project.git", credentials: credentials)
+    described_class.new(url, credentials: credentials)
   end
 
-  describe :full_url do
+  describe 'full_url' do
     it { expect(import_url.full_url).to eq("https://blah:password@github.com/me/project.git") }
   end
 
-  describe :sanitized_url do
+  describe 'sanitized_url' do
     it { expect(import_url.sanitized_url).to eq("https://github.com/me/project.git") }
   end
 
-  describe :credentials 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