Commit 3ef80368 authored by Sean McGivern's avatar Sean McGivern

Backport MR create service changes from EE

In EE, the `filter_params` method needs the MR to already have its
`target_project` assigned.
parent c17b1d5f
...@@ -7,9 +7,8 @@ module MergeRequests ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment