From 1b24b6640c1a23b0c43cda7b4a1af15eb270a8c6 Mon Sep 17 00:00:00 2001 From: Sean McGivern Date: Wed, 10 Apr 2019 12:19:58 +0000 Subject: [PATCH] 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 (cherry picked from commit 94d9de694ec75f118077010e696f13150cd30cc7) bf611f3e Correct path to cluster health partial c52946eb Add helper to check clusters/_health conditional d3430fbd Rename clusters/health partial 7dbb5d64 Move helper to ee 51b8d34f Pass cluster as parameter to helper --- app/helpers/clusters_helper.rb | 5 +++++ app/views/clusters/clusters/show.html.haml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/helpers/clusters_helper.rb b/app/helpers/clusters_helper.rb index 769f75f57c4..30d8a19ecce 100644 --- a/app/helpers/clusters_helper.rb +++ b/app/helpers/clusters_helper.rb @@ -20,4 +20,9 @@ module ClustersHelper !cluster.provider.legacy_abac? end + + # EE overrides this + def show_cluster_health_graphs?(cluster) + false + end end diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 62b947ca40d..e38a16e7a1a 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -34,7 +34,7 @@ = render 'banner' = 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 -- GitLab