Add latest changes from gitlab-org/gitlab@master

1 files changed, 4 insertions, 2 deletions

diff --git a/spec/controllers/concerns/import_url_params_spec.rb b/spec/controllers/concerns/import_url_params_spec.rb
index adbe6e5d3bf..41e29d71386 100644
--- a/spec/controllers/concerns/import_url_params_spec.rb
+++ b/spec/controllers/concerns/import_url_params_spec.rb
@@ -31,7 +31,8 @@ describe ImportUrlParams do
     describe '#import_url_params' do
       it 'returns hash with import_url' do
         expect(import_url_params).to eq(
-          import_url: "https://user:password@url.com"
+          import_url: "https://user:password@url.com",
+          import_type: 'git'
         )
       end
     end
@@ -48,7 +49,8 @@ describe ImportUrlParams do
     describe '#import_url_params' do
       it 'does not change the url' do
         expect(import_url_params).to eq(
-          import_url: "https://user:password@url.com"
+          import_url: "https://user:password@url.com",
+          import_type: 'git'
         )
       end
     end