diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-01-31 03:26:40 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-02-07 01:12:24 +0300 |
| commit | c8b63a28afa811881b617546fe94a19378585a04 (patch) | |
| tree | 2b1bd2e9d52e059de0589a014f518f23e9b71ca3 /app/models/merge_request.rb | |
| parent | 3aa1264dc6c0de3625bb1a2d6a0ee90140a2f519 (diff) | |
Improve performance of finding last deployed environment
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 0155073a1c9..965315c42a8 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -720,21 +720,15 @@ class MergeRequest < ActiveRecord::Base @environments ||= begin target_envs = target_project.environments_for( - target_branch, commit: diff_head_commit, with_tags: true) + ref: target_branch, commit: diff_head_commit, with_tags: true) source_envs = source_project.environments_for( - source_branch, commit: diff_head_commit) if source_project + ref: source_branch, commit: diff_head_commit) if source_project (target_envs.to_a + source_envs.to_a).uniq end end - def latest_environment - return @latest_environment if defined?(@latest_environment) - - @latest_environment = Environment.latest_for_commit(environments, diff_head_commit) - end - def state_human_name if merged? "Merged" |