Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'
Fix MR assignees for push options Closes #60305 See merge request gitlab-org/gitlab-ce!27186
This commit is contained in:
commit
0ec86af85e
2 changed files with 3 additions and 3 deletions
|
@ -100,7 +100,7 @@ module MergeRequests
|
|||
merge_request = ::MergeRequests::CreateService.new(
|
||||
project,
|
||||
current_user,
|
||||
merge_request.attributes
|
||||
merge_request.attributes.merge(assignees: merge_request.assignees)
|
||||
).execute
|
||||
end
|
||||
|
||||
|
@ -119,7 +119,7 @@ module MergeRequests
|
|||
|
||||
def create_params(branch)
|
||||
params = {
|
||||
assignee: current_user,
|
||||
assignees: [current_user],
|
||||
source_branch: branch,
|
||||
source_project: project,
|
||||
target_branch: push_options[:target] || target_project.default_branch,
|
||||
|
|
|
@ -38,7 +38,7 @@ describe MergeRequests::PushOptionsHandlerService do
|
|||
it 'assigns the MR to the user' do
|
||||
service.execute
|
||||
|
||||
expect(last_mr.assignee).to eq(user)
|
||||
expect(last_mr.assignees).to contain_exactly(user)
|
||||
end
|
||||
|
||||
context 'when project has been forked' do
|
||||
|
|
Loading…
Reference in a new issue