From 0d8e625e4cd499162e6113dca4988b28f9faa9b6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 25 May 2020 15:07:58 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/workers/repository_import_worker.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'app/workers/repository_import_worker.rb') diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb index 9f17ef467e3..30570a2227e 100644 --- a/app/workers/repository_import_worker.rb +++ b/app/workers/repository_import_worker.rb @@ -43,7 +43,12 @@ class RepositoryImportWorker # rubocop:disable Scalability/IdempotentWorker def start_import return true if start(project.import_state) - Rails.logger.info("Project #{project.full_path} was in inconsistent state (#{project.import_status}) while importing.") # rubocop:disable Gitlab/RailsLogger + Gitlab::Import::Logger.info( + message: 'Project was in inconsistent state while importing', + project_full_path: project.full_path, + project_import_status: project.import_status + ) + false end -- cgit v1.2.3