summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-12-03 16:07:58 +0900
committerShinya Maeda <shinya@gitlab.com>2018-12-03 16:07:58 +0900
commite4aa403367f0a7826b3aa1ee1e324d93fce742f2 (patch)
tree5849d2121f0f2470b2c7926ceb1e35871f5e9c9f
parent2c283734194250f84ee51ff7ff6dcce7a01b5870 (diff)
downloadgitlab-ce-user-update-head-pipeline-worker.tar.gz
-rw-r--r--app/models/merge_request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 99e1c4fe989..920ec342816 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -1062,9 +1062,9 @@ class MergeRequest < ActiveRecord::Base
def set_head_pipeline
pipeline = source_project.pipelines
- .where(sha: diff_head_sha, ref: source_branch)
+ .where(ref: source_branch)
.order(id: :desc)
- .first
+ .find_by_sha(diff_head_sha)
return false unless pipeline