diff options
| author | Mayra Cabrera <mcabrera@gitlab.com> | 2018-12-07 17:28:50 +0300 |
|---|---|---|
| committer | Thong Kuah <tkuah@gitlab.com> | 2018-12-16 23:50:53 +0300 |
| commit | 0369e7590428923c0ab2b10a8911f6c60ee93d62 (patch) | |
| tree | f07c5d373bf9239bb582107993e82bbaa14cd3e8 /app/views/clusters | |
| parent | aa86223a4a24396a23db00ba88e3950dc77b8410 (diff) | |
Refactor methods on ClusterHelper
- Use sprite_icon instead of hardcoded html
- Use a more descriptive method name
- Changes specs to use html_safe matcher
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/_cluster.html.haml | 1 | ||||
| -rw-r--r-- | app/views/clusters/clusters/index.html.haml | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/_cluster.html.haml b/app/views/clusters/clusters/_cluster.html.haml index 94be148b55d..98715bdf655 100644 --- a/app/views/clusters/clusters/_cluster.html.haml +++ b/app/views/clusters/clusters/_cluster.html.haml @@ -4,7 +4,6 @@ .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Kubernetes cluster") .table-mobile-content = cluster_group_path_display(cluster, clusterable) - = link_to cluster.name, cluster.show_path - unless cluster.enabled? %span.badge.badge-danger Connection disabled .table-section.section-25 diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml index 94565e53e06..932395eb50e 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 display_clusters_callout?(@clusters, clusterable) + - if render_cluster_help_content?(@clusters, clusterable) .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 |