diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2016-08-11 17:26:04 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2016-08-11 17:26:04 +0800 |
| commit | 4b559c9afb34b80b910efec514653c6ea65adba8 (patch) | |
| tree | 7470c474011876afc98770617c22eec0b1dbe3b4 /app/models/merge_request.rb | |
| parent | 517249858e41694f51b67461b313d5a34c2a466c (diff) | |
| download | gitlab-ce-4b559c9afb34b80b910efec514653c6ea65adba8.tar.gz | |
Reverse ref and sha in args and rename pipeline to pipeline_for
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index b1fb3ce5d69..7c8e938df75 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -666,7 +666,8 @@ class MergeRequest < ActiveRecord::Base end def pipeline - @pipeline ||= source_project.pipeline(diff_head_sha, source_branch) if diff_head_sha && source_project + return unless diff_head_sha && source_project + @pipeline ||= source_project.pipeline_for(source_branch, diff_head_sha) end def merge_commit |