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:
authorThong Kuah <tkuah@gitlab.com>2018-12-11 08:13:29 +0300
committerThong Kuah <tkuah@gitlab.com>2018-12-16 23:51:53 +0300
commitf82c9dbe44d5d003dbeb084f07615ba26c2294b6 (patch)
tree4b4a803a08c29b969797937af47a30ac0ef0b1a8 /app/views/clusters
parent2ad5f999e95ed0627e2c8aea9da670b7da559bab (diff)
Use finder to decide to show note to user
Given the note is about how to interpret ancestor clusters, use the finder which actually knows if there are any ancestor clusters to find out if the note should be shown, rather than passing the same info via a view to a helper Added note about Kaminari.paginate_array Link to followup issue too
Diffstat (limited to 'app/views/clusters')
-rw-r--r--app/views/clusters/clusters/index.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml
index 932395eb50e..58d0a304363 100644
--- a/app/views/clusters/clusters/index.html.haml
+++ b/app/views/clusters/clusters/index.html.haml
@@ -12,7 +12,7 @@
= s_("ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project")
= render 'clusters/clusters/buttons'
- - if render_cluster_help_content?(@clusters, clusterable)
+ - if @has_ancestor_clusters
.bs-callout.bs-callout-info
= s_("ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.")
%strong