Commit ebcd24f3 authored by José Iván Vargas López's avatar José Iván Vargas López Committed by Jose Vargas

Merge branch 'security-filter_creds_during_project_import-11-1' into 'security-11-1'

[11.1] Filter out credentials from Sidekiq logs during project import

See merge request gitlab/gitlabhq!2450
parent 42becff5
......@@ -23,7 +23,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
......
---
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
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment