Merge branch '49272-sanitize-git-url-in-import-errors' into 'master'

Resolve "Credentails used for repository import are visible inside the Sidekiq logs (Background Jobs)"

See merge request gitlab-org/gitlab-ce!20641

app/services/projects/import_service.rb

@@ -25,7 +25,7 @@ module Projects
       success
     rescue => e
-      error("Error importing repository #{project.import_url} into #{project.full_path} - #{e.message}")
+      error("Error importing repository #{project.safe_import_url} into #{project.full_path} - #{e.message}")
     end
     private

changelogs/unreleased/49272-sanitize-git-url-in-import-errors.yml

+---
+title: Sanitize git URL in import errors
+merge_request:
+author: Jamie Schembri
+type: fixed

spec/services/projects/import_service_spec.rb

@@ -69,7 +69,7 @@ describe Projects::ImportService do
         result = subject.execute
         expect(result[:status]).to eq :error
-        expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - The repository could not be created."
+        expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - The repository could not be created."
       end
       context 'when repository creation succeeds' do
@@ -141,7 +141,7 @@ describe Projects::ImportService do
           result = subject.execute
           expect(result[:status]).to eq :error
-          expect(result[:message]).to eq "Error importing repository #{project.import_url} into #{project.full_path} - Failed to import the repository"
+          expect(result[:message]).to eq "Error importing repository #{project.safe_import_url} into #{project.full_path} - Failed to import the repository"
         end
         context 'when repository import scheduled' do