Skip to content
Snippets Groups Projects
Commit 1b24b664 authored by Sean McGivern's avatar Sean McGivern Committed by GitLab Release Tools Bot
Browse files

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 94d9de69)

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
parent 76228a95
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -20,4 +20,9 @@ module ClustersHelper
 
!cluster.provider.legacy_abac?
end
# EE overrides this
def show_cluster_health_graphs?(cluster)
false
end
end
Loading
Loading
@@ -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
 
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment