diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-10-17 10:56:55 +0100 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2016-10-17 10:56:55 +0100 |
| commit | 86dcb79be37f5759dfeaa26283ed8bf031b38d54 (patch) | |
| tree | 70869aeaa6bfbdcaada873cfd3e4054c62d3e25a /app/models/merge_request.rb | |
| parent | 26e327ea93140f6400b965b845958ff50461718c (diff) | |
| parent | 052de0600c6b137e6f9df08250b4cf5f38280295 (diff) | |
| download | gitlab-ce-86dcb79be37f5759dfeaa26283ed8bf031b38d54.tar.gz | |
Merge branch 'master' into merge-conflicts-editor-2
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1fb0371fe06..8c6905a442d 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -688,12 +688,15 @@ class MergeRequest < ActiveRecord::Base def environments return [] unless diff_head_commit - environments = source_project.environments_for( - source_branch, diff_head_commit) - environments += target_project.environments_for( - target_branch, diff_head_commit, with_tags: true) - - environments.uniq + @environments ||= + begin + environments = source_project.environments_for( + source_branch, diff_head_commit) + environments += target_project.environments_for( + target_branch, diff_head_commit, with_tags: true) + + environments.uniq + end end def state_human_name |