diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2019-02-21 15:10:05 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2019-02-21 15:10:05 +0900 |
| commit | 7a4d1ada055fe24711d436bd68dfa6f9dcde4bbd (patch) | |
| tree | d27d8a69302a5e44c9a31fd2ccc451ce0c14dc72 | |
| parent | 5444b0a1fadf57cbbb2183001c53864421f8c0fc (diff) | |
| download | gitlab-ce-fix-mr-head-pipeline-for-merge-ref.tar.gz | |
Fix headpipeline for merge shafix-mr-head-pipeline-for-merge-ref
| -rw-r--r-- | app/models/merge_request.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 75fca96ce0a..eca6f85f084 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -1369,10 +1369,14 @@ class MergeRequest < ActiveRecord::Base source_project.repository.squash_in_progress?(id) end + def merge_ref_sha + project.repository.commit(merge_ref_path) + end + private def find_actual_head_pipeline source_project&.ci_pipelines - &.latest_for_merge_request(self, source_branch, diff_head_sha) + &.latest_for_merge_request(self, source_branch, [diff_head_sha, merge_ref_sha]) end end |