Merge branch 'master' into docs-patch-71docs-patch-71

1 files changed, 1 insertions, 13 deletions

diff --git a/lib/after_commit_queue.rb b/lib/after_commit_queue.rb
index 6fb7985f955..6a180fdf338 100644
--- a/lib/after_commit_queue.rb
+++ b/lib/after_commit_queue.rb
@@ -15,7 +15,7 @@ module AfterCommitQueue
   end
 
   def run_after_commit_or_now(&block)
-    if AfterCommitQueue.inside_transaction?
+    if Gitlab::Database.inside_transaction?
       if ActiveRecord::Base.connection.current_transaction.records.include?(self)
         run_after_commit(&block)
       else
@@ -32,18 +32,6 @@ module AfterCommitQueue
     true
   end
 
-  def self.open_transactions_baseline
-    if ::Rails.env.test?
-      return DatabaseCleaner.connections.count { |conn| conn.strategy.is_a?(DatabaseCleaner::ActiveRecord::Transaction) }
-    end
-
-    0
-  end
-
-  def self.inside_transaction?
-    ActiveRecord::Base.connection.open_transactions > open_transactions_baseline
-  end
-
   protected
 
   def _run_after_commit_queue