Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 06:10:21 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-05-12 06:10:21 +0300
commit3e7f2f00ca92b26d631009c5f45986500a27024b (patch)
treef91f6c4dc97a762a58190b4bb9ea355e2fc2cd7c /db/fixtures/development/10_merge_requests.rb
parenta160c4b1a72105a751cdc2f9f973dbe39a1c0dfd (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'db/fixtures/development/10_merge_requests.rb')
-rw-r--r--db/fixtures/development/10_merge_requests.rb6
1 files changed, 3 insertions, 3 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