diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-04 09:08:23 +0300 |
| commit | be81c1578d65f25edfde8aa550f190b8d3e6d976 (patch) | |
| tree | 0695fcaec3739d0ba486985bae2ebd85a3f49ee5 /app/views/clusters | |
| parent | bb19d18713d1b3da7d564826f5e21e8d9f9f36cd (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/index.html.haml | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml index 049010cadf4..28002dbff92 100644 --- a/app/views/clusters/clusters/index.html.haml +++ b/app/views/clusters/clusters/index.html.haml @@ -18,13 +18,16 @@ %strong = link_to _('More information'), help_page_path('user/group/clusters/index', anchor: 'cluster-precedence') - .clusters-table.js-clusters-list - .gl-responsive-table-row.table-row-header{ role: "row" } - .table-section.section-60{ role: "rowheader" } - = s_("ClusterIntegration|Kubernetes cluster") - .table-section.section-30{ role: "rowheader" } - = s_("ClusterIntegration|Environment scope") - .table-section.section-10{ role: "rowheader" } - - @clusters.each do |cluster| - = render "cluster", cluster: cluster.present(current_user: current_user) - = paginate @clusters, theme: "gitlab" + - if Feature.enabled?(:clusters_list_redesign) + #js-clusters-list-app{ data: { endpoint: 'todo/add/endpoint' } } + - else + .clusters-table.js-clusters-list + .gl-responsive-table-row.table-row-header{ role: "row" } + .table-section.section-60{ role: "rowheader" } + = s_("ClusterIntegration|Kubernetes cluster") + .table-section.section-30{ role: "rowheader" } + = s_("ClusterIntegration|Environment scope") + .table-section.section-10{ role: "rowheader" } + - @clusters.each do |cluster| + = render "cluster", cluster: cluster.present(current_user: current_user) + = paginate @clusters, theme: "gitlab" |