Add latest changes from gitlab-org/gitlab@master

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index acad19e096c..022752a0650 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -147,9 +147,16 @@ module Gitlab
       # spec/support/database/prevent_cross_joins.rb
     end
 
+    # This method will allow cross database modifications within the block
+    # Example:
+    #
+    # allow_cross_database_modification_within_transaction(url: 'url-to-an-issue') do
+    #   create(:build) # inserts ci_build and project record in one transaction
+    # end
     def self.allow_cross_database_modification_within_transaction(url:)
-      # this method is implemented in:
+      # this method will be overridden in:
       # spec/support/database/cross_database_modification_check.rb
+      yield
     end
 
     def self.add_post_migrate_path_to_rails(force: false)