essential
This commit is contained in:
parent
93e96c3fcf
commit
1fcf3f3d94
1 changed files with 6 additions and 1 deletions
|
@ -12,7 +12,6 @@ module MergeRequests
|
||||||
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)
|
||||||
merge_request.head_pipeline = head_pipeline_for(merge_request)
|
|
||||||
|
|
||||||
create(merge_request)
|
create(merge_request)
|
||||||
end
|
end
|
||||||
|
@ -22,10 +21,16 @@ module MergeRequests
|
||||||
notification_service.new_merge_request(issuable, current_user)
|
notification_service.new_merge_request(issuable, current_user)
|
||||||
todo_service.new_merge_request(issuable, current_user)
|
todo_service.new_merge_request(issuable, current_user)
|
||||||
issuable.cache_merge_request_closes_issues!(current_user)
|
issuable.cache_merge_request_closes_issues!(current_user)
|
||||||
|
update_merge_requests_head_pipeline(issuable)
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
|
|
||||||
|
def update_merge_requests_head_pipeline(merge_request)
|
||||||
|
pipeline = head_pipeline_for(merge_request)
|
||||||
|
merge_request.update(head_pipeline_id: pipeline.id) if pipeline
|
||||||
|
end
|
||||||
|
|
||||||
def head_pipeline_for(merge_request)
|
def head_pipeline_for(merge_request)
|
||||||
return unless merge_request.source_project
|
return unless merge_request.source_project
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue