diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 15:10:14 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-23 15:10:14 +0000 |
| commit | e0b023e38851fc66277c08e7216b61eb347af33d (patch) | |
| tree | d837fab0737df0083f95cd8c562df62b4de1c0c3 /app/views/clusters | |
| parent | a071c2888d62f7a56349e99f5c070407df2e17c1 (diff) | |
| download | gitlab-ce-e0b023e38851fc66277c08e7216b61eb347af33d.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/clusters')
| -rw-r--r-- | app/views/clusters/clusters/index.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml index 557ad1bf280..01e94e124f9 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 Feature.enabled?(:clusters_list_redesign) + - if Feature.enabled?(:clusters_list_redesign, default_enabled: true) #js-clusters-list-app{ data: js_clusters_list_data(clusterable.index_path(format: :json)) } - else - if @has_ancestor_clusters @@ -20,7 +20,7 @@ = s_('ClusterIntegration|Clusters are utilized by selecting the nearest ancestor with a matching environment scope. For example, project clusters will override group clusters.') %strong = link_to _('More information'), help_page_path('user/group/clusters/index', anchor: 'cluster-precedence') - .clusters-table.js-clusters-list + .clusters-table.js-clusters-list{ data: { testid: 'cluster_list_table' } } .gl-responsive-table-row.table-row-header{ role: "row" } .table-section.section-60{ role: "rowheader" } = s_("ClusterIntegration|Kubernetes cluster") |