Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/gitlab/database/batch_counter.rb b/lib/gitlab/database/batch_counter.rb
index 7efa5b46ecb..6c0ce9e481a 100644
--- a/lib/gitlab/database/batch_counter.rb
+++ b/lib/gitlab/database/batch_counter.rb
@@ -31,7 +31,7 @@ module Gitlab
       end
 
       def count(batch_size: nil, mode: :itself, start: nil, finish: nil)
-        raise 'BatchCount can not be run inside a transaction' if @relation.connection.transaction_open?
+        raise 'BatchCount can not be run inside a transaction' if transaction_open?
 
         check_mode!(mode)
 
@@ -87,6 +87,10 @@ module Gitlab
         results
       end
 
+      def transaction_open?
+        @relation.connection.transaction_open?
+      end
+
       def merge_results(results, object)
         return object unless results