diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 06:10:21 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-12 06:10:21 +0300 |
| commit | 3e7f2f00ca92b26d631009c5f45986500a27024b (patch) | |
| tree | f91f6c4dc97a762a58190b4bb9ea355e2fc2cd7c /spec/workers/process_commit_worker_spec.rb | |
| parent | a160c4b1a72105a751cdc2f9f973dbe39a1c0dfd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/workers/process_commit_worker_spec.rb')
| -rw-r--r-- | spec/workers/process_commit_worker_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/workers/process_commit_worker_spec.rb b/spec/workers/process_commit_worker_spec.rb index 7a168bf054e..294a05c652b 100644 --- a/spec/workers/process_commit_worker_spec.rb +++ b/spec/workers/process_commit_worker_spec.rb @@ -94,7 +94,7 @@ RSpec.describe ProcessCommitWorker do project.repository.after_create_branch MergeRequests::MergeService - .new(project, merge_request.author, { sha: merge_request.diff_head_sha }) + .new(project: project, current_user: merge_request.author, params: { sha: merge_request.diff_head_sha }) .execute(merge_request) merge_request.reload.merge_commit |