diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 16:19:18 +0200 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-06-02 16:59:04 +0200 |
| commit | 021d3810c300d1e0514f21ccb6f1439f59e20565 (patch) | |
| tree | 771a663395f39530559c73016f26087a0489fae2 /app/models/merge_request.rb | |
| parent | 5accd87ad7b0d960e504910d896a832288e51c8d (diff) | |
| download | gitlab-ce-021d3810c300d1e0514f21ccb6f1439f59e20565.tar.gz | |
Rename Ci::Commit to Ci::Pipeline and rename some of the ci_commit to pipeline
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 722c258244c..6c7668778ba 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -579,8 +579,8 @@ class MergeRequest < ActiveRecord::Base diverged_commits_count > 0 end - def ci_commit - @ci_commit ||= source_project.ci_commit(last_commit.id, source_branch) if last_commit && source_project + def pipeline + @pipeline ||= source_project.pipeline(last_commit.id, source_branch) if last_commit && source_project end def diff_refs |