diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-06-27 20:17:25 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-06-28 23:22:51 +0100 |
| commit | 7016bb7bee81db4afa7e9d7ba0ba12d0ac1e1dd8 (patch) | |
| tree | ed4ad3d6372e47e3b034c09c0e64471e856277e7 /lib | |
| parent | e4506de9976eea5eb76bb6e9c639fefa48582f03 (diff) | |
| download | gitlab-ce-7016bb7bee81db4afa7e9d7ba0ba12d0ac1e1dd8.tar.gz | |
Merge branch 'fix-head-pipeline-for-commit-status' into 'master'
Fix head pipeline stored in merge request for external pipelines
Closes #34130
See merge request !12478
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/commit_statuses.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb index 10f2d5ef6a3..485b680cd5f 100644 --- a/lib/api/commit_statuses.rb +++ b/lib/api/commit_statuses.rb @@ -108,6 +108,9 @@ module API render_api_error!('invalid state', 400) end + MergeRequest.where(source_project: @project, source_branch: ref) + .update_all(head_pipeline_id: pipeline) if pipeline.latest? + present status, with: Entities::CommitStatus rescue StateMachines::InvalidTransition => e render_api_error!(e.message, 400) |