Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42

1 files changed, 2 insertions, 18 deletions

diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index 21c3d7cb7e2..d0b73a3364a 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -1,12 +1,9 @@
-- avatar_size = sidebar_refactor_disabled? ? 24 : 18
-- avatar_size_class = sidebar_refactor_disabled? ? 's40' : 's32'
-
 %aside.nav-sidebar.qa-admin-sidebar{ class: ("sidebar-collapsed-desktop" if collapsed_sidebar?), 'aria-label': _('Admin navigation') }
   .nav-sidebar-inner-scroll
     .context-header
       = link_to admin_root_path, title: _('Admin Overview') do
-        %span{ class: ['avatar-container', 'settings-avatar', 'rect-avatar', avatar_size_class] }
-          = sprite_icon('admin', size: avatar_size)
+        %span{ class: ['avatar-container', 'settings-avatar', 'rect-avatar', 's32'] }
+          = sprite_icon('admin', size: 18)
         %span.sidebar-context-title
           = _('Admin Area')
     %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } }
@@ -209,19 +206,6 @@
 
       = render_if_exists 'layouts/nav/sidebar/credentials_link'
 
-      - if show_service_templates_nav_link?
-        = nav_link(controller: :services) do
-          = link_to admin_application_settings_services_path do
-            .nav-icon-container
-              = sprite_icon('template')
-            %span.nav-item-name
-              = _('Service Templates')
-          %ul.sidebar-sub-level-items.is-fly-out-only
-            = nav_link(controller: :services, html_options: { class: "fly-out-top-item" } ) do
-              = link_to admin_application_settings_services_path do
-                %strong.fly-out-top-item-name
-                  = _('Service Templates')
-
       = nav_link(controller: :labels) do
         = link_to admin_labels_path do
           .nav-icon-container