Merge branch 'add-security-dashboard-link-ce' into 'master'

Sync group sidebar template with EE

See merge request gitlab-org/gitlab-ce!22549

2 files changed, 22 insertions, 1 deletions

diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb
index f573fd399a5..0c313e9e6d3 100644
--- a/app/helpers/groups_helper.rb
+++ b/app/helpers/groups_helper.rb
@@ -1,6 +1,15 @@
 # frozen_string_literal: true
 
 module GroupsHelper
+  def group_overview_nav_link_paths
+    %w[
+      groups#show
+      groups#activity
+      groups#subgroups
+      analytics#show
+    ]
+  end
+
   def group_nav_link_paths
     %w[groups#projects groups#edit badges#index ci_cd#show ldap_group_links#index hooks#index audit_events#index pipeline_quota#index]
   end
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index 4aa22138498..163556f4509 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -12,7 +12,7 @@
           = @group.name
     %ul.sidebar-top-level-items.qa-group-sidebar
       - if group_sidebar_link?(:overview)
-        = nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
+        = nav_link(path: group_overview_nav_link_paths, html_options: { class: 'home' }) do
           = link_to group_path(@group) do
             .nav-icon-container
               = sprite_icon('home')
@@ -36,6 +36,16 @@
                   %span
                     = _('Activity')
 
+            = render_if_exists 'groups/sidebar/security_dashboard'
+
+            - if group_sidebar_link?(:contribution_analytics)
+              = nav_link(path: 'analytics#show') do
+                = link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
+                  %span
+                    Contribution Analytics
+
+      = render_if_exists "layouts/nav/ee/epic_link", group: @group
+
       - if group_sidebar_link?(:issues)
         = nav_link(path: issues_sub_menu_items) do
           = link_to issues_group_path(@group) do
@@ -132,4 +142,6 @@
                 %span
                   = _('CI / CD')
 
+            = render_if_exists "groups/ee/settings_nav"
+
     = render 'shared/sidebar_toggle_button'