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

Backport MR create service changes from EE

Browse source 
In EE, the `filter_params` method needs the MR to already have its
`target_project` assigned.
This commit is contained in:
Sean McGivern 2017-07-12 09:45:40 +01:00
parent c17b1d5f56
commit 3ef8036883
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/services/merge_requests/create_service.rb
View file

@ -7,9 +7,8 @@ module MergeRequests
source_project = @project source_project = @project
@project = Project.find(params[:target_project_id]) if params[:target_project_id] @project = Project.find(params[:target_project_id]) if params[:target_project_id]
params[:target_project_id] ||= source_project.id
merge_request = MergeRequest.new merge_request = MergeRequest.new
merge_request.target_project = @project
merge_request.source_project = source_project merge_request.source_project = source_project
merge_request.source_branch = params[:source_branch] merge_request.source_branch = params[:source_branch]
merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch)