Add latest changes from gitlab-org/gitlab@master

7 files changed, 16 insertions, 51 deletions

diff --git a/app/views/clusters/clusters/_buttons.html.haml b/app/views/clusters/clusters/_buttons.html.haml
deleted file mode 100644
index c81d1d5b05a..00000000000
--- a/app/views/clusters/clusters/_buttons.html.haml
+++ /dev/null
@@ -1,6 +0,0 @@
-.nav-controls
-  - if clusterable.can_add_cluster?
-    = link_to s_('ClusterIntegration|Add Kubernetes cluster'), clusterable.new_path, class: 'btn btn-success js-add-cluster'
-  - else
-    %span.btn.btn-add-cluster.disabled.js-add-cluster
-      = s_("ClusterIntegration|Add Kubernetes cluster")
diff --git a/app/views/clusters/clusters/_cluster.html.haml b/app/views/clusters/clusters/_cluster.html.haml
deleted file mode 100644
index f11117ea5c4..00000000000
--- a/app/views/clusters/clusters/_cluster.html.haml
+++ /dev/null
@@ -1,19 +0,0 @@
-.card
-  .card-body.gl-responsive-table-row
-    .table-section.section-60
-      .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Kubernetes cluster")
-      .table-mobile-content.gl-display-flex.gl-align-items-center.gl-justify-content-end.gl-justify-content-md-start
-        .gl-w-6.gl-h-6.gl-mr-3.gl-display-flex.gl-align-items-center= provider_icon(cluster.provider_type)
-        = 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
-      .table-mobile-header{ role: "rowheader" }= s_("ClusterIntegration|Environment scope")
-      .table-mobile-content= cluster.environment_scope
-    .table-section.section-15.text-right
-      .table-mobile-header{ role: "rowheader" }
-      .table-mobile-content
-        %span.badge.badge-light
-          = cluster.cluster_type_description
diff --git a/app/views/clusters/clusters/index.html.haml b/app/views/clusters/clusters/index.html.haml
index 01e94e124f9..803b3d1c156 100644
--- a/app/views/clusters/clusters/index.html.haml
+++ b/app/views/clusters/clusters/index.html.haml
@@ -10,23 +10,11 @@
     .top-area.adjust
       .nav-text
         = s_('ClusterIntegration|Kubernetes clusters can be used to deploy applications and to provide Review Apps for this project')
-      = render 'clusters/clusters/buttons'
+      .nav-controls
+        - if clusterable.can_add_cluster?
+          = link_to s_('ClusterIntegration|Add Kubernetes cluster'), clusterable.new_path, class: 'btn gl-button btn-success js-add-cluster'
+        - else
+          %span.btn.gl-button.btn-success.js-add-cluster.disabled
+            = s_("ClusterIntegration|Add Kubernetes cluster")
 
-    - 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
-        .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
-            = link_to _('More information'), help_page_path('user/group/clusters/index', anchor: 'cluster-precedence')
-      .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")
-          .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"
+    #js-clusters-list-app{ data: js_clusters_list_data(clusterable.index_path(format: :json)) }
diff --git a/app/views/projects/cycle_analytics/show.html.haml b/app/views/projects/cycle_analytics/show.html.haml
index d7e10efc3b1..ca689b0bad7 100644
--- a/app/views/projects/cycle_analytics/show.html.haml
+++ b/app/views/projects/cycle_analytics/show.html.haml
@@ -1,4 +1,6 @@
 - page_title _("Value Stream Analytics")
+- content_for :page_specific_javascripts do
+  = stylesheet_link_tag 'page_bundles/cycle_analytics'
 
 #cycle-analytics{ "v-cloak" => "true", data: { request_path: project_cycle_analytics_path(@project) } }
   - if @cycle_analytics_no_data
diff --git a/app/views/projects/pipeline_schedules/index.html.haml b/app/views/projects/pipeline_schedules/index.html.haml
index 0bcf8ae605a..91083cc0768 100644
--- a/app/views/projects/pipeline_schedules/index.html.haml
+++ b/app/views/projects/pipeline_schedules/index.html.haml
@@ -2,7 +2,7 @@
 
 - page_title _("Pipeline Schedules")
 
-#pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), image_url: image_path('pages/projects/pipeline_schedules/shared/icons/intro_illustration.svg') } }
+#pipeline-schedules-callout{ data: { docs_url: help_page_path('ci/pipelines/schedules'), image_url: image_path('illustrations/pipeline_schedule_callout.svg') } }
 .top-area
   - schedule_path_proc = ->(scope) { pipeline_schedules_path(@project, scope: scope) }
   = render "tabs", schedule_path_proc: schedule_path_proc, all_schedules: @all_schedules, scope: @scope
diff --git a/app/views/shared/labels/_form.html.haml b/app/views/shared/labels/_form.html.haml
index 78ff225daad..2df6c3a6afd 100644
--- a/app/views/shared/labels/_form.html.haml
+++ b/app/views/shared/labels/_form.html.haml
@@ -28,7 +28,7 @@
       = render_suggested_colors
   .form-actions
     - if @label.persisted?
-      = f.submit 'Save changes', class: 'btn btn-success js-save-button'
+      = f.submit 'Save changes', class: 'btn gl-button btn-success js-save-button'
     - else
-      = f.submit 'Create label', class: 'btn btn-success js-save-button qa-label-create-button'
-    = link_to 'Cancel', back_path, class: 'btn btn-cancel'
+      = f.submit 'Create label', class: 'btn gl-button btn-success js-save-button qa-label-create-button'
+    = link_to 'Cancel', back_path, class: 'btn gl-button btn-cancel'
diff --git a/app/views/shared/labels/_nav.html.haml b/app/views/shared/labels/_nav.html.haml
index d613ea466fa..cc43174dc19 100644
--- a/app/views/shared/labels/_nav.html.haml
+++ b/app/views/shared/labels/_nav.html.haml
@@ -15,10 +15,10 @@
       .input-group
         = search_field_tag :search, params[:search], { placeholder: _('Filter'), id: 'label-search', class: 'form-control search-text-input input-short', spellcheck: false, autofocus: true }
         %span.input-group-append
-          %button.btn.btn-default{ type: "submit", "aria-label" => _('Submit search') }
+          %button.btn.gl-button.btn-default{ type: "submit", "aria-label" => _('Submit search') }
             = icon("search")
     = render 'shared/labels/sort_dropdown'
     - if labels_or_filters && can_admin_label && @project
-      = link_to _('New label'), new_project_label_path(@project), class: "btn btn-success qa-label-create-new"
+      = link_to _('New label'), new_project_label_path(@project), class: "btn gl-button btn-success qa-label-create-new"
     - if labels_or_filters && can_admin_label && @group
-      = link_to _('New label'), new_group_label_path(@group), class: "btn btn-success qa-label-create-new"
+      = link_to _('New label'), new_group_label_path(@group), class: "btn gl-button btn-success qa-label-create-new"