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

Sync group sidebar template with EE

See merge request gitlab-org/gitlab-ce!22549
This commit is contained in:
Kamil Trzciński 2018-10-24 07:47:51 +00:00
commit 5522f0f4e5
2 changed files with 22 additions and 1 deletions

View file

@ -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

View file

@ -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'