Add latest changes from gitlab-org/gitlab@master

2 files changed, 3 insertions, 17 deletions

diff --git a/lib/gitlab/import_export/json/streaming_serializer.rb b/lib/gitlab/import_export/json/streaming_serializer.rb
index 78f43f79072..42e014e91f8 100644
--- a/lib/gitlab/import_export/json/streaming_serializer.rb
+++ b/lib/gitlab/import_export/json/streaming_serializer.rb
@@ -6,11 +6,7 @@ module Gitlab
       class StreamingSerializer
         include Gitlab::ImportExport::CommandLineUtil
 
-        BATCH_SIZE = 2
-
-        def self.batch_size(exportable)
-          BATCH_SIZE
-        end
+        BATCH_SIZE = 100
 
         class Raw < String
           def to_json(*_args)
@@ -88,7 +84,7 @@ module Gitlab
         end
 
         def batch(relation, key)
-          opts = { of: batch_size }
+          opts = { of: BATCH_SIZE }
           order_by = reorders(relation, key)
 
           # we need to sort issues by non primary key column(relative_position)
@@ -138,10 +134,6 @@ module Gitlab
           relations_schema[:preload]
         end
 
-        def batch_size
-          @batch_size ||= self.class.batch_size(@exportable)
-        end
-
         def reorders(relation, key)
           export_reorder = relations_schema[:export_reorder]&.dig(key)
           return unless export_reorder
diff --git a/lib/gitlab/import_export/legacy_relation_tree_saver.rb b/lib/gitlab/import_export/legacy_relation_tree_saver.rb
index c6b961ea210..cf75a2c7fa8 100644
--- a/lib/gitlab/import_export/legacy_relation_tree_saver.rb
+++ b/lib/gitlab/import_export/legacy_relation_tree_saver.rb
@@ -7,7 +7,7 @@ module Gitlab
 
       def serialize(exportable, relations_tree)
         Gitlab::ImportExport::FastHashSerializer
-          .new(exportable, relations_tree, batch_size: batch_size(exportable))
+          .new(exportable, relations_tree)
           .execute
       end
 
@@ -18,12 +18,6 @@ module Gitlab
 
         File.write(File.join(dir_path, filename), tree_json)
       end
-
-      private
-
-      def batch_size(exportable)
-        Gitlab::ImportExport::Json::StreamingSerializer.batch_size(exportable)
-      end
     end
   end
 end