Automatic merge of gitlab-org/gitlab-ce master

app/views/projects/pipelines/charts.html.haml

@@ -2,12 +2,9 @@
 - page_title _('CI / CD Charts')
 
 %div{ class: container_class }
+
   #charts.ci-charts
-    .row
-      .col-md-6
-        = render 'projects/pipelines/charts/overall'
-      .col-md-6
-        = render 'projects/pipelines/charts/pipeline_times'
+    = render 'projects/pipelines/charts/overall'
 
     %hr
     = render 'projects/pipelines/charts/pipelines'

app/views/projects/pipelines/charts/_overall.haml

-%h4= s_("PipelineCharts|Overall statistics")
-%ul
-  %li
-    = s_("PipelineCharts|Total:")
-    %strong= n_("1 pipeline", "%d pipelines", @counts[:total]) % @counts[:total]
-  %li
-    = s_("PipelineCharts|Successful:")
-    %strong= n_("1 pipeline", "%d pipelines", @counts[:success]) % @counts[:success]
-  %li
-    = s_("PipelineCharts|Failed:")
-    %strong= n_("1 pipeline", "%d pipelines", @counts[:failed]) % @counts[:failed]
-  %li
-    = s_("PipelineCharts|Success ratio:")
-    %strong
-      #{success_ratio(@counts)}%
+%h4.mt-4.mb-4= s_("PipelineCharts|Overall statistics")
+.row
+  .col-md-6
+    = render 'projects/pipelines/charts/pipeline_statistics'
+  .col-md-6
+    = render 'projects/pipelines/charts/pipeline_times'

app/views/projects/pipelines/charts/_pipeline_statistics.haml

+%ul
+  %li
+    = s_("PipelineCharts|Total:")
+    %strong= n_("1 pipeline", "%d pipelines", @counts[:total]) % @counts[:total]
+  %li
+    = s_("PipelineCharts|Successful:")
+    %strong= n_("1 pipeline", "%d pipelines", @counts[:success]) % @counts[:success]
+  %li
+    = s_("PipelineCharts|Failed:")
+    %strong= n_("1 pipeline", "%d pipelines", @counts[:failed]) % @counts[:failed]
+  %li
+    = s_("PipelineCharts|Success ratio:")
+    %strong
+      #{success_ratio(@counts)}%

app/views/projects/pipelines/charts/_pipelines.haml

-%h4= _("Pipelines charts")
+%h4.mt-4.mb-4= _("Pipelines charts")
 %p
    
   %span.legend-success

app/views/shared/projects/_project.html.haml

@@ -89,4 +89,4 @@
             %span.icon-wrapper.pipeline-status
               = render 'ci/status/icon', status: project.commit.last_pipeline.detailed_status(current_user), type: 'commit', tooltip_placement: 'top', path: pipeline_path
         .updated-note
-          %span Updated #{updated_tooltip}
+          %span _('Updated') #{updated_tooltip}

changelogs/unreleased/ds-charts-whitespace.yml

+---
+title: Improves section header whitespace on the CI/CD Charts page
+merge_request: 30531
+author:
+type: fixed