Add latest changes from gitlab-org/gitlab@14-8-stable-eev14.8.0-rc42

1 files changed, 7 insertions, 2 deletions

diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index f820f911d61..52eea73ecd2 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -156,13 +156,13 @@
             = sprite_icon('slight-frown')
           %span.nav-item-name
             = _('Abuse Reports')
-          %span.badge.badge-pill.count= number_with_delimiter(AbuseReport.count(:all))
+          = gl_badge_tag number_with_delimiter(AbuseReport.count(:all)), variant: :info, size: :sm
         %ul.sidebar-sub-level-items.is-fly-out-only
           = nav_link(controller: :abuse_reports, html_options: { class: "fly-out-top-item" } ) do
             = link_to admin_abuse_reports_path do
               %strong.fly-out-top-item-name
                 = _('Abuse Reports')
-              %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(AbuseReport.count(:all))
+              = gl_badge_tag number_with_delimiter(AbuseReport.count(:all)), variant: :info, size: :sm
 
       = render_if_exists 'layouts/nav/sidebar/licenses_link'
 
@@ -269,6 +269,11 @@
               = link_to metrics_and_profiling_admin_application_settings_path, title: _('Metrics and profiling'), class: 'qa-admin-settings-metrics-and-profiling-item' do
                 %span
                   = _('Metrics and profiling')
+            - if Feature.enabled?(:admin_application_settings_service_usage_data_center, default_enabled: :yaml)
+              = nav_link(path: ['application_settings#service_usage_data']) do
+                = link_to service_usage_data_admin_application_settings_path, title: _('Service usage data') do
+                  %span
+                    = _('Service usage data')
             = nav_link(path: 'application_settings#network') do
               = link_to network_admin_application_settings_path, title: _('Network'), data: { qa_selector: 'admin_settings_network_item' } do
                 %span