diff options
| author | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 01:59:19 +0300 |
|---|---|---|
| committer | Connor Shea <connor.james.shea@gmail.com> | 2016-08-17 01:59:19 +0300 |
| commit | 1d3aa59f99a72f613b84286eef948dfbad20925e (patch) | |
| tree | 0061000ff2226f3bc4e88ce8133a65403de9f37e /app/models/merge_request.rb | |
| parent | 1e7cbe0b05ddd9c72987730323e63d612d429ab9 (diff) | |
| parent | 76aa85cc8023e1a8176f0b783a52154f98a5be8f (diff) | |
Merge branch 'master' into diff-line-comment-vuejs
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 afff006065e..5bb48117851 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -610,6 +610,14 @@ class MergeRequest < ActiveRecord::Base !pipeline || pipeline.success? end + def environments + return unless diff_head_commit + + target_project.environments.select do |environment| + environment.includes_commit?(diff_head_commit) + end + end + def state_human_name if merged? "Merged" |