summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDave Pisek <dpisek@gitlab.com>2019-07-11 11:23:53 +1000
committerDave Pisek <dpisek@gitlab.com>2019-07-24 13:21:19 +1000
commit1ef1b9d5607047370970b6236a6738807f05637f (patch)
tree886cb78a46af734f2a5a2723df619458e2a1884e
parentc47412d48369c5e2becb2a7ce786aac73d0b325c (diff)
downloadgitlab-ce-12250-mvc-security-navigation-section-group.tar.gz
Add "security" top-nevel item to group sidebar12250-mvc-security-navigation-section-group
This commits moves the second-level navigation item 'Security Dashboard' into a top-level item. The rendering of the actual item is EE specific.
-rw-r--r--app/views/layouts/nav/sidebar/_group.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index 4b5ccc33716..48c9f19f89f 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -36,8 +36,6 @@
%span
= _('Activity')
- = render_if_exists 'groups/sidebar/security_dashboard' # EE-specific
-
- 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
@@ -105,6 +103,8 @@
= _('Merge Requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(merge_requests_count)
+ = render_if_exists "layouts/nav/ee/security_link" # EE-specific
+
- if group_sidebar_link?(:kubernetes)
= nav_link(controller: [:clusters]) do
= link_to group_clusters_path(@group) do