Commit 94d9de69 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix-cluster-health-ce' into 'master'

Correct path to cluster health partial

Closes gitlab-ee#10990

See merge request gitlab-org/gitlab-ce!27107
parents 0de88f57 605daf6f
...@@ -20,4 +20,9 @@ module ClustersHelper ...@@ -20,4 +20,9 @@ module ClustersHelper
!cluster.provider.legacy_abac? !cluster.provider.legacy_abac?
end end
# EE overrides this
def show_cluster_health_graphs?(cluster)
false
end
end end
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
= render 'banner' = render 'banner'
= render 'form' = render 'form'
= render_if_exists 'health' = render_if_exists 'projects/clusters/prometheus_graphs' if show_cluster_health_graphs?(@cluster)
.cluster-applications-table#js-cluster-applications .cluster-applications-table#js-cluster-applications
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment