BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit d362d96a by Grzegorz Bizon Committed by James Edwards-Jones
Options

Merge branch 'backport-mr-create-service-changes' into 'master'

Backport MR create service changes from EE See merge request !12808
parent d11a2dd8
Showing with 1 addition and 2 deletions
app/services/merge_requests/create_service.rb
...@@ -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