From 88ce9b624561a2a5836c623bdd07a81ffc611da7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 2 Feb 2023 00:12:29 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- app/services/export_csv/base_service.rb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'app/services/export_csv') diff --git a/app/services/export_csv/base_service.rb b/app/services/export_csv/base_service.rb index 21b830d427a..98ab33d4c33 100644 --- a/app/services/export_csv/base_service.rb +++ b/app/services/export_csv/base_service.rb @@ -25,7 +25,11 @@ module ExportCsv # rubocop: disable CodeReuse/ActiveRecord def csv_builder @csv_builder ||= - CsvBuilder.new(objects.preload(associations_to_preload), header_to_value_hash) + if preload_associations_in_batches? + CsvBuilder.new(objects, header_to_value_hash, associations_to_preload) + else + CsvBuilder.new(objects.preload(associations_to_preload), header_to_value_hash, []) + end end # rubocop: enable CodeReuse/ActiveRecord @@ -36,5 +40,9 @@ module ExportCsv def header_to_value_hash raise NotImplementedError end + + def preload_associations_in_batches? + false + end end end -- cgit v1.2.3