Merge branch 'fix-broken-seeder-11.6' into 'master'

Fix broken seeder 11.6

Closes #54949

See merge request gitlab-org/gitlab-ce!23608

2 files changed, 18 insertions, 8 deletions

diff --git a/db/fixtures/development/04_project.rb b/db/fixtures/development/04_project.rb
index 089de211380..aa8686ac7d8 100644
--- a/db/fixtures/development/04_project.rb
+++ b/db/fixtures/development/04_project.rb
@@ -71,13 +71,17 @@ Sidekiq::Testing.inline! do
         params[:storage_version] = Project::LATEST_STORAGE_VERSION
       end
 
-      project = Projects::CreateService.new(User.first, params).execute
-      # Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
-      # hook won't run until after the fixture is loaded. That is too late
-      # since the Sidekiq::Testing block has already exited. Force clearing
-      # the `after_commit` queue to ensure the job is run now.
+      project = nil
+
       Sidekiq::Worker.skipping_transaction_check do
+        project = Projects::CreateService.new(User.first, params).execute
+
+        # Seed-Fu runs this entire fixture in a transaction, so the `after_commit`
+        # hook won't run until after the fixture is loaded. That is too late
+        # since the Sidekiq::Testing block has already exited. Force clearing
+        # the `after_commit` queue to ensure the job is run now.
         project.send(:_run_after_commit_queue)
+        project.import_state.send(:_run_after_commit_queue)
       end
 
       if project.valid? && project.valid_repo?
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb
index bcfdd058a1c..8bdc7c6556c 100644
--- a/db/fixtures/development/10_merge_requests.rb
+++ b/db/fixtures/development/10_merge_requests.rb
@@ -25,7 +25,9 @@ Gitlab::Seeder.quiet do
       developer = project.team.developers.sample
       break unless developer
 
-      MergeRequests::CreateService.new(project, developer, params).execute
+      Sidekiq::Worker.skipping_transaction_check do
+        MergeRequests::CreateService.new(project, developer, params).execute
+      end
       print '.'
     end
   end
@@ -39,7 +41,9 @@ Gitlab::Seeder.quiet do
     target_branch: 'master',
     title: 'Can be automatically merged'
   }
-  MergeRequests::CreateService.new(project, User.admins.first, params).execute
+  Sidekiq::Worker.skipping_transaction_check do
+    MergeRequests::CreateService.new(project, User.admins.first, params).execute
+  end
   print '.'
 
   params = {
@@ -47,6 +51,8 @@ Gitlab::Seeder.quiet do
     target_branch: 'feature',
     title: 'Cannot be automatically merged'
   }
-  MergeRequests::CreateService.new(project, User.admins.first, params).execute
+  Sidekiq::Worker.skipping_transaction_check do
+    MergeRequests::CreateService.new(project, User.admins.first, params).execute
+  end
   print '.'
 end