Add latest changes from gitlab-org/gitlab@master

1 files changed, 9 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