From 3ef80368839b9d295bfdf2b75b5ced1748884d0d Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 12 Jul 2017 09:45:40 +0100 Subject: Backport MR create service changes from EE In EE, the `filter_params` method needs the MR to already have its `target_project` assigned. --- app/services/merge_requests/create_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb index 71d37797bb4..19189e64acf 100644 --- a/app/services/merge_requests/create_service.rb +++ b/app/services/merge_requests/create_service.rb @@ -7,9 +7,8 @@ module MergeRequests source_project = @project @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.target_project = @project merge_request.source_project = source_project merge_request.source_branch = params[:source_branch] merge_request.merge_params['force_remove_source_branch'] = params.delete(:force_remove_source_branch) -- cgit v1.2.1