diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-04-01 17:36:11 +0300 |
| commit | 04bb35a4b562fd57b14c55645bb1848a50cdef56 (patch) | |
| tree | 1bd1ac2af6a5c088ac2529cdbccceeca402d3ebe /app/views/clusters/clusters/show.html.haml | |
| parent | ade207e575ab846f6d354aaccc1382a6e512dd0d (diff) | |
| parent | b8118a65d595040bfce2d83d5e38dd63ebfedb58 (diff) | |
| download | gitlab-ce-id-split-self-approval-restrictions.tar.gz | |
Merge branch 'master' into id-split-self-approval-restrictionsid-split-self-approval-restrictions
Diffstat (limited to 'app/views/clusters/clusters/show.html.haml')
| -rw-r--r-- | app/views/clusters/clusters/show.html.haml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/show.html.haml b/app/views/clusters/clusters/show.html.haml index 884fa323093..62b947ca40d 100644 --- a/app/views/clusters/clusters/show.html.haml +++ b/app/views/clusters/clusters/show.html.haml @@ -17,7 +17,7 @@ install_knative_path: clusterable.install_applications_cluster_path(@cluster, :knative), update_knative_path: clusterable.update_applications_cluster_path(@cluster, :knative), toggle_status: @cluster.enabled? ? 'true': 'false', - has_rbac: @cluster.platform_kubernetes_rbac? ? 'true': 'false', + has_rbac: has_rbac_enabled?(@cluster) ? 'true': 'false', cluster_type: @cluster.cluster_type, cluster_status: @cluster.status_name, cluster_status_reason: @cluster.status_reason, @@ -34,6 +34,8 @@ = render 'banner' = render 'form' + = render_if_exists 'health' + .cluster-applications-table#js-cluster-applications %section.settings#js-cluster-details{ class: ('expanded' if expanded) } @@ -51,5 +53,5 @@ %button.btn.js-settings-toggle{ type: 'button' } = expanded ? _('Collapse') : _('Expand') %p= s_("ClusterIntegration|Advanced options on this Kubernetes cluster's integration") - .settings-content + .settings-content#advanced-settings-section = render 'advanced_settings' |