1 files changed, 14 insertions, 13 deletions
diff --git a/app/views/layouts/nav/sidebar/_admin.html.haml b/app/views/layouts/nav/sidebar/_admin.html.haml
index d756867541b..b71866c9138 100644
--- a/app/views/layouts/nav/sidebar/_admin.html.haml
+++ b/app/views/layouts/nav/sidebar/_admin.html.haml
@@ -2,9 +2,9 @@
   .nav-sidebar-inner-scroll
     .context-header
       = link_to admin_root_path, title: _('Admin Overview') do
-        .avatar-container.s40.settings-avatar
+        %span.avatar-container.s40.settings-avatar
           = sprite_icon('admin', size: 24)
-        .sidebar-context-title
+        %span.sidebar-context-title
           = _('Admin Area')
     %ul.sidebar-top-level-items{ data: { qa_selector: 'admin_sidebar_overview_submenu_content' } }
       = nav_link(controller: %w(dashboard admin admin/projects users groups jobs runners gitaly_servers), html_options: {class: 'home'}) do
@@ -202,17 +202,18 @@
 
       = render_if_exists 'layouts/nav/sidebar/credentials_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')
+      - 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