summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-08-02 22:11:32 +0900
committerShinya Maeda <shinya@gitlab.com>2017-08-04 14:11:23 +0900
commit1fcf3f3d94a157e2b57735ca9d0a306b91e75323 (patch)
treee4b613586259308b161a85eacfa4204595414184
parent93e96c3fcf30c476df332a7e5e762134ffb5da3e (diff)
downloadgitlab-ce-1fcf3f3d94a157e2b57735ca9d0a306b91e75323.tar.gz
essential
-rw-r--r--app/services/merge_requests/create_service.rb7
1 files changed, 6 insertions, 1 deletions
diff --git a/app/services/merge_requests/create_service.rb b/app/services/merge_requests/create_service.rb
index 19189e64acf..5414fa79def 100644
--- a/app/services/merge_requests/create_service.rb
+++ b/app/services/merge_requests/create_service.rb
@@ -12,7 +12,6 @@ module MergeRequests
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)
- merge_request.head_pipeline = head_pipeline_for(merge_request)
create(merge_request)
end
@@ -22,10 +21,16 @@ module MergeRequests
notification_service.new_merge_request(issuable, current_user)
todo_service.new_merge_request(issuable, current_user)
issuable.cache_merge_request_closes_issues!(current_user)
+ update_merge_requests_head_pipeline(issuable)
end
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)
return unless merge_request.source_project