diff options
author | Sean McGivern <sean@gitlab.com> | 2019-04-10 12:19:58 +0000 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2019-04-10 12:19:58 +0000 |
commit | 94d9de694ec75f118077010e696f13150cd30cc7 (patch) | |
tree | 5efba4fda96849e30f66673da7b42c28af3d4cfd | |
parent | 0de88f57997ef1d60467464f15411dae0c7ee870 (diff) | |
parent | 605daf6f6421cff867fc0a86b7794432e693efc9 (diff) | |
download | gitlab-ce-94d9de694ec75f118077010e696f13150cd30cc7.tar.gz |
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
-rw-r--r-- | app/helpers/clusters_helper.rb | 5 | ||||
-rw-r--r-- | app/views/clusters/clusters/show.html.haml | 2 |
2 files changed, 6 insertions, 1 deletions
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 |