diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2019-07-08 16:07:21 +0300 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2019-07-08 16:07:21 +0300 |
commit | 886521c7e563e04574fd803a22476f1158961fad (patch) | |
tree | 642291847190298979eff5e3e4a06ca43039b8d7 /app/serializers/environment_status_entity.rb | |
parent | d14d1340c6d26a132e8db1f9b883aa87276b457c (diff) | |
parent | 56c129293578cb620daf1c19b1bc61cd18d9fa83 (diff) |
Merge branch '63475-fix-n-1' into 'master'
Reduce N+1 queries in MergeRequestsController#ci_environment_status
See merge request gitlab-org/gitlab-ce!30224
Diffstat (limited to 'app/serializers/environment_status_entity.rb')
-rw-r--r-- | app/serializers/environment_status_entity.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/serializers/environment_status_entity.rb b/app/serializers/environment_status_entity.rb index f6321b9e520..811cc2ad5af 100644 --- a/app/serializers/environment_status_entity.rb +++ b/app/serializers/environment_status_entity.rb @@ -11,7 +11,7 @@ class EnvironmentStatusEntity < Grape::Entity project_environment_path(es.project, es.environment) end - expose :metrics_url, if: ->(*) { can_read_environment? && deployment.has_metrics? } do |es| + expose :metrics_url, if: ->(*) { can_read_environment? && has_metrics? } do |es| metrics_project_environment_deployment_path(es.project, es.environment, es.deployment) end @@ -45,8 +45,8 @@ class EnvironmentStatusEntity < Grape::Entity object.environment end - def deployment - object.deployment + def has_metrics? + object.has_metrics? end def project |