Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPawel Chojnacki <pawel@chojnacki.ws>2018-02-26 14:40:40 +0300
committerPawel Chojnacki <pawel@chojnacki.ws>2018-02-26 14:40:40 +0300
commit637c9558627655aaf08066371f0a5d50461578be (patch)
tree4820ad1969448abf71d4533f3225504b93f0fb5c /app/models/environment.rb
parent0feeddaa0f4831e53d8d094b0cbb84222524431a (diff)
Fix failing test, when deployment platform is not bound to a cluster.
Diffstat (limited to 'app/models/environment.rb')
-rw-r--r--app/models/environment.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/models/environment.rb b/app/models/environment.rb
index 966ce17a48a..0c408257499 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -233,8 +233,10 @@ class Environment < ActiveRecord::Base
end
def cluster_prometheus_adapter
- cluster = project.deployment_platform&.cluster
- return unless cluster&.application_prometheus&.installed?
+ return unless project.deployment_platform.respond_to?(:cluster)
+
+ cluster = project.deployment_platform.cluster
+ return unless cluster.application_prometheus&.installed?
cluster.application_prometheus
end