Add latest changes from gitlab-org/gitlab@master

2 files changed, 10 insertions, 5 deletions

diff --git a/lib/gitlab/import_export/json/streaming_serializer.rb b/lib/gitlab/import_export/json/streaming_serializer.rb
index 04ca598ff5d..7f55a0a3821 100644
--- a/lib/gitlab/import_export/json/streaming_serializer.rb
+++ b/lib/gitlab/import_export/json/streaming_serializer.rb
@@ -69,11 +69,13 @@ module Gitlab
         end
 
         def serialize_many_each(key, records, options)
-          records.each do |record|
-            json = Raw.new(record.to_json(options))
-
-            json_writer.append(key, json)
+          enumerator = Enumerator.new do |items|
+            records.each do |record|
+              items << Raw.new(record.to_json(options))
+            end
           end
+
+          json_writer.write_relation_array(@exportable_path, key, enumerator)
         end
 
         def serialize_single_relation(key, record, options)
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb
index c8932b26925..06ee81ba172 100644
--- a/lib/gitlab/redis/wrapper.rb
+++ b/lib/gitlab/redis/wrapper.rb
@@ -15,8 +15,11 @@ module Gitlab
         delegate :params, :url, to: :new
 
         def with
+          pool.with { |redis| yield redis }
+        end
+
+        def pool
           @pool ||= ConnectionPool.new(size: pool_size) { ::Redis.new(params) }
-          @pool.with { |redis| yield redis }
         end
 
         def pool_size