diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-06 21:08:54 +0300 |
commit | 0d6fa033121a9bef708b8f2de186c4034c61d4a3 (patch) | |
tree | 851d65a09efbffa114c9a273e590d55cfb1436ab /app/views/clusters | |
parent | 0eb3d2f799ce4f4de87fb9fc6fd98e592323bc89 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
-rw-r--r-- | app/views/clusters/clusters/_cluster.html.haml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/clusters/clusters/_cluster.html.haml b/app/views/clusters/clusters/_cluster.html.haml index 04afc38a056..9b6c0c20080 100644 --- a/app/views/clusters/clusters/_cluster.html.haml +++ b/app/views/clusters/clusters/_cluster.html.haml @@ -4,6 +4,8 @@ .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Kubernetes cluster") .table-mobile-content = cluster.item_link(clusterable, html_options: { data: { qa_selector: 'cluster', qa_cluster_name: cluster.name } }) + - if cluster.status_name == :creating + .spinner.ml-2.align-middle.has-tooltip{ title: s_("ClusterIntegration|Cluster being created") } - unless cluster.enabled? %span.badge.badge-danger Connection disabled .table-section.section-25 |