diff options
Diffstat (limited to 'db/fixtures')
| -rw-r--r-- | db/fixtures/development/10_merge_requests.rb | 6 | ||||
| -rw-r--r-- | db/fixtures/development/26_container_images.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/db/fixtures/development/10_merge_requests.rb b/db/fixtures/development/10_merge_requests.rb index 8cda3eb51be..19bec2cef72 100644 --- a/db/fixtures/development/10_merge_requests.rb +++ b/db/fixtures/development/10_merge_requests.rb @@ -36,7 +36,7 @@ Gitlab::Seeder.quiet do break unless developer Sidekiq::Worker.skipping_transaction_check do - MergeRequests::CreateService.new(project, developer, params).execute + MergeRequests::CreateService.new(project: project, current_user: developer, params: params).execute rescue Repository::AmbiguousRefError # Ignore pipelines creation errors for now, we can doing that after # https://gitlab.com/gitlab-org/gitlab-foss/issues/55966. will be resolved. @@ -55,7 +55,7 @@ Gitlab::Seeder.quiet do title: 'Can be automatically merged' } Sidekiq::Worker.skipping_transaction_check do - MergeRequests::CreateService.new(project, User.admins.first, params).execute + MergeRequests::CreateService.new(project: project, current_user: User.admins.first, params: params).execute end print '.' @@ -65,7 +65,7 @@ Gitlab::Seeder.quiet do title: 'Cannot be automatically merged' } Sidekiq::Worker.skipping_transaction_check do - MergeRequests::CreateService.new(project, User.admins.first, params).execute + MergeRequests::CreateService.new(project: project, current_user: User.admins.first, params: params).execute end print '.' end diff --git a/db/fixtures/development/26_container_images.rb b/db/fixtures/development/26_container_images.rb index 5b5879673b9..fdee57c73e3 100644 --- a/db/fixtures/development/26_container_images.rb +++ b/db/fixtures/development/26_container_images.rb @@ -57,7 +57,7 @@ Gitlab::Seeder.quiet do seeder.seed! rescue => e puts "\nSeeding container images failed with #{e.message}." - puts "Make sure that the registry is running (https://gitlab.com/gitlab-org/gitlab-development-kit/blob/master/doc/howto/registry.md) and that Docker CLI (https://www.docker.com/products/docker-desktop) is installed." + puts "Make sure that the registry is running (https://gitlab.com/gitlab-org/gitlab-development-kit/blob/main/doc/howto/registry.md) and that Docker CLI (https://www.docker.com/products/docker-desktop) is installed." end else puts "Skipped. Use the `#{flag}` environment variable to seed container images to the registry." |