summaryrefslogtreecommitdiff
path: root/app/services
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2018-07-23 10:19:16 +0000
committerRémy Coutable <remy@rymai.me>2018-07-23 10:19:16 +0000
commit1917aa984dfa7e5a8073697c3250d313047526d4 (patch)
tree48981e45a81eb690a77fa37ee9915fa8518d8417 /app/services
parentcc540bb2a2177825ed52adbaff468566826279ad (diff)
parentd32802c76b37df936af5086e37bd93761c29799b (diff)
downloadgitlab-ce-1917aa984dfa7e5a8073697c3250d313047526d4.tar.gz
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
Diffstat (limited to 'app/services')
-rw-r--r--app/services/projects/import_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/projects/import_service.rb b/app/services/projects/import_service.rb
index e560d40371e..0c426faa22d 100644
--- a/app/services/projects/import_service.rb
+++ b/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