Commit 32aa7bd6 authored by Fatih Acet's avatar Fatih Acet

Merge branch '12250-mvc-security-navigation-section-group' into 'master'

Add "security" top-level item to group sidebar

See merge request gitlab-org/gitlab-ce!30604
parents a34654f3 1ef1b9d5
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
%span %span
= _('Activity') = _('Activity')
= render_if_exists 'groups/sidebar/security_dashboard' # EE-specific
- if group_sidebar_link?(:contribution_analytics) - if group_sidebar_link?(:contribution_analytics)
= nav_link(path: 'analytics#show') do = nav_link(path: 'analytics#show') do
= link_to group_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right' } do = link_to group_analytics_path(@group), title: _('Contribution Analytics'), data: { placement: 'right' } do
...@@ -105,6 +103,8 @@ ...@@ -105,6 +103,8 @@
= _('Merge Requests') = _('Merge Requests')
%span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= number_with_delimiter(merge_requests_count) %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) - if group_sidebar_link?(:kubernetes)
= nav_link(controller: [:clusters]) do = nav_link(controller: [:clusters]) do
= link_to group_clusters_path(@group) do = link_to group_clusters_path(@group) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment