diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-07-24 11:30:50 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-07-24 11:30:50 +0000 |
| commit | 32aa7bd6745630e5dac87541a6f1a33773d97a4a (patch) | |
| tree | 35957900d6d20634ba32dd82330f33ce5e5acc95 /app/views/layouts/nav/sidebar | |
| parent | a34654f3741befe84892dfd0be2a77acb9b57d91 (diff) | |
| parent | 1ef1b9d5607047370970b6236a6738807f05637f (diff) | |
| download | gitlab-ce-32aa7bd6745630e5dac87541a6f1a33773d97a4a.tar.gz | |
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
Diffstat (limited to 'app/views/layouts/nav/sidebar')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 4 |
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 |