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
This commit is contained in:
commit
1917aa984d
|
@ -25,7 +25,7 @@ module Projects
|
||||||
|
|
||||||
success
|
success
|
||||||
rescue => e
|
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
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Sanitize git URL in import errors
|
||||||
|
merge_request:
|
||||||
|
author: Jamie Schembri
|
||||||
|
type: fixed
|
|
@ -69,7 +69,7 @@ describe Projects::ImportService do
|
||||||
result = subject.execute
|
result = subject.execute
|
||||||
|
|
||||||
expect(result[:status]).to eq :error
|
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
|
end
|
||||||
|
|
||||||
context 'when repository creation succeeds' do
|
context 'when repository creation succeeds' do
|
||||||
|
@ -141,7 +141,7 @@ describe Projects::ImportService do
|
||||||
result = subject.execute
|
result = subject.execute
|
||||||
|
|
||||||
expect(result[:status]).to eq :error
|
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
|
end
|
||||||
|
|
||||||
context 'when repository import scheduled' do
|
context 'when repository import scheduled' do
|
||||||
|
|
Loading…
Reference in New Issue