GitLab wurde erfolgreich aktualisiert. Das Aktivieren von Shared Runnern in kürzlich erstellten Projekten ist jetzt wieder möglich.

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

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 @@ def execute ...@@ -23,7 +23,7 @@ def execute
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
......
---
title: Sanitize git URL in import errors
merge_request:
author: Jamie Schembri
type: fixed
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
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 @@ ...@@ -141,7 +141,7 @@
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
......
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