summaryrefslogtreecommitdiff
path: root/lib/bulk_imports/common/pipelines
diff options
context:
space:
mode:
Diffstat (limited to 'lib/bulk_imports/common/pipelines')
-rw-r--r--lib/bulk_imports/common/pipelines/entity_finisher.rb8
-rw-r--r--lib/bulk_imports/common/pipelines/wiki_pipeline.rb2
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/bulk_imports/common/pipelines/entity_finisher.rb b/lib/bulk_imports/common/pipelines/entity_finisher.rb
index 5066f622d57..a52504d04bc 100644
--- a/lib/bulk_imports/common/pipelines/entity_finisher.rb
+++ b/lib/bulk_imports/common/pipelines/entity_finisher.rb
@@ -24,11 +24,13 @@ module BulkImports
end
logger.info(
- bulk_import_id: context.bulk_import_id,
- bulk_import_entity_id: context.entity.id,
- bulk_import_entity_type: context.entity.source_type,
+ bulk_import_id: entity.bulk_import_id,
+ bulk_import_entity_id: entity.id,
+ bulk_import_entity_type: entity.source_type,
+ source_full_path: entity.source_full_path,
pipeline_class: self.class.name,
message: "Entity #{entity.status_name}",
+ source_version: entity.bulk_import.source_version_info.to_s,
importer: 'gitlab_migration'
)
diff --git a/lib/bulk_imports/common/pipelines/wiki_pipeline.rb b/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
index fea550b9f9d..68d511b065f 100644
--- a/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
+++ b/lib/bulk_imports/common/pipelines/wiki_pipeline.rb
@@ -24,7 +24,7 @@ module BulkImports
Gitlab::UrlBlocker.validate!(url, schemes: %w[http https], allow_local_network: allow_local_requests?, allow_localhost: allow_local_requests?)
- wiki.ensure_repository
+ wiki.create_wiki_repository
wiki.repository.fetch_as_mirror(url)
end