Merge branch 'georgekoltsov/update-import-object-builder-transaction' into 'master'

Update Import/Export ObjectBuilder to not use Project.transaction

See merge request gitlab-org/gitlab!79361

lib/gitlab/import_export/base/object_builder.rb

@@ -31,12 +31,18 @@ module Gitlab
 
         def find
           find_with_cache do
-            find_object || klass.create(prepare_attributes)
+            find_object || create_object
           end
         end
 
         protected
 
+        def create_object
+          klass.transaction do
+            klass.create(prepare_attributes)
+          end
+        end
+
         def where_clauses
           raise NotImplementedError
         end

lib/gitlab/import_export/group/object_builder.rb

@@ -9,12 +9,6 @@ module Gitlab
       #   `Group::ObjectBuilder.build(Label, label_attributes)`
       #    finds or initializes a label with the given attributes.
       class ObjectBuilder < Base::ObjectBuilder
-        def self.build(*args)
-          ::Group.transaction do
-            super
-          end
-        end
-
         def initialize(klass, attributes)
           super
 

lib/gitlab/import_export/project/object_builder.rb

@@ -13,14 +13,6 @@ module Gitlab
       #
       # It also adds some logic around Group Labels/Milestones for edge cases.
       class ObjectBuilder < Base::ObjectBuilder
-        def self.build(*args)
-          ::Gitlab::Database::QueryAnalyzers::PreventCrossDatabaseModification.allow_cross_database_modification_within_transaction(url: 'https://gitlab.com/gitlab-org/gitlab/-/issues/350091') do
-            ::Project.transaction do
-              super
-            end
-          end
-        end
-
         def initialize(klass, attributes)
           super