Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 8 deletions

diff --git a/app/services/bulk_imports/file_download_service.rb b/app/services/bulk_imports/file_download_service.rb
index 8f72c35a94c..8fa438a76ce 100644
--- a/app/services/bulk_imports/file_download_service.rb
+++ b/app/services/bulk_imports/file_download_service.rb
@@ -96,7 +96,6 @@ module BulkImports
         message: message,
         response_code: response_code,
         response_headers: response_headers,
-        importer: 'gitlab_migration',
         last_chunk_context: last_chunk_context
       )
 
diff --git a/app/services/bulk_imports/process_service.rb b/app/services/bulk_imports/process_service.rb
index 2d9a0d6a6c9..1484a6fddd3 100644
--- a/app/services/bulk_imports/process_service.rb
+++ b/app/services/bulk_imports/process_service.rb
@@ -106,16 +106,11 @@ module BulkImports
     end
 
     def log_skipped_pipeline(pipeline, entity, minimum_version, maximum_version)
-      logger.info(
+      logger.with_entity(entity).info(
         message: 'Pipeline skipped as source instance version not compatible with pipeline',
-        bulk_import_entity_id: entity.id,
-        bulk_import_id: entity.bulk_import_id,
-        bulk_import_entity_type: entity.source_type,
-        source_full_path: entity.source_full_path,
         pipeline_class: pipeline[:pipeline],
         minimum_source_version: minimum_version,
-        maximum_source_version: maximum_version,
-        source_version: entity.source_version.to_s
+        maximum_source_version: maximum_version
       )
     end