diff options
| author | José Iván Vargas López <jvargas@gitlab.com> | 2018-08-24 18:31:39 +0000 |
|---|---|---|
| committer | Jose Vargas <jvargas@gitlab.com> | 2018-08-24 14:46:03 -0500 |
| commit | ebcd24f375cfb7f146d9deee5cfa313d58ce0fe5 (patch) | |
| tree | 49126ed406db70558ba90a97183f0f00668245cb /app | |
| parent | 42becff534b1d322f103942da856a8bf521415e9 (diff) | |
| download | gitlab-ce-ebcd24f375cfb7f146d9deee5cfa313d58ce0fe5.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/services/projects/import_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb index 1781a01cbd4..6c3db925d06 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -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 |