diff options
| author | Jarka Kadlecova <jarka@gitlab.com> | 2017-09-07 09:58:15 +0200 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2017-12-05 12:54:10 -0200 |
| commit | fe673b492769dc888268a1b2ac25342faa18a817 (patch) | |
| tree | 11c2e4b9126feb999b21c54bdd8343b59bab2172 /app/models/merge_request.rb | |
| parent | 003a816afa885d56aa1eb4aadbad2b13b1baa25b (diff) | |
| download | gitlab-ce-fe673b492769dc888268a1b2ac25342faa18a817.tar.gz | |
Ensure pippeline corresponds with the sha of an MR
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index bbc01e9677c..d2ed6f7a8ae 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -145,6 +145,14 @@ class MergeRequest < ActiveRecord::Base '!' end + def head_pipeline + return unless head_pipeline_id + + last_pipeline = Ci::Pipeline.find(head_pipeline_id) + + last_pipeline.sha == diff_head_sha ? last_pipeline : nil + end + # Pattern used to extract `!123` merge request references from text # # This pattern supports cross-project references. |