diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-02 03:12:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-02-02 03:12:29 +0300 |
commit | 88ce9b624561a2a5836c623bdd07a81ffc611da7 (patch) | |
tree | 01288a1f7b54888b677548173697e8c20a344cb0 /app/services | |
parent | d170c7eeef81debb74afa518c256358ccb7e231c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/export_csv/base_service.rb | 10 | ||||
-rw-r--r-- | app/services/issues/export_csv_service.rb | 4 |
2 files changed, 13 insertions, 1 deletions
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 diff --git a/app/services/issues/export_csv_service.rb b/app/services/issues/export_csv_service.rb index 9efded4aa43..d7c1ea276de 100644 --- a/app/services/issues/export_csv_service.rb +++ b/app/services/issues/export_csv_service.rb @@ -55,6 +55,10 @@ module Issues issue.timelogs.sum(&:time_spent) end # rubocop: enable CodeReuse/ActiveRecord + + def preload_associations_in_batches? + Feature.enabled?(:export_csv_preload_in_batches, resource_parent) + end end end |