kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '60305-fix-mr-assignee-for-mr-push-options' into 'master'

Browse source 
Fix MR assignees for push options

Closes #60305

See merge request gitlab-org/gitlab-ce!27186
This commit is contained in:
Douglas Barbosa Alexandre 2019-04-09 20:32:21 +00:00
commit 0ec86af85e
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/services/merge_requests/push_options_handler_service.rb
View file

@ -100,7 +100,7 @@ module MergeRequests
merge_request = ::MergeRequests::CreateService.new( merge_request = ::MergeRequests::CreateService.new(
project, project,
current_user, current_user,
merge_request.attributes merge_request.attributes.merge(assignees: merge_request.assignees)
).execute ).execute
end end
@ -119,7 +119,7 @@ module MergeRequests
def create_params(branch) def create_params(branch)
params = { params = {
assignee: current_user, assignees: [current_user],
source_branch: branch, source_branch: branch,
source_project: project, source_project: project,
target_branch: push_options[:target] || target_project.default_branch, target_branch: push_options[:target] || target_project.default_branch,

2
spec/services/merge_requests/push_options_handler_service_spec.rb
View file

@ -38,7 +38,7 @@ describe MergeRequests::PushOptionsHandlerService do
it 'assigns the MR to the user' do it 'assigns the MR to the user' do
service.execute service.execute
expect(last_mr.assignee).to eq(user) expect(last_mr.assignees).to contain_exactly(user)
end end
context 'when project has been forked' do context 'when project has been forked' do