Commit a34654f3 authored by Fatih Acet's avatar Fatih Acet

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

Add "Security & Compliance" as top-level item to the project sidebar

See merge request gitlab-org/gitlab-ce!30564
parents 642253b7 5b159819
...@@ -34,10 +34,6 @@ ...@@ -34,10 +34,6 @@
= link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do = link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do
%span= _('Releases') %span= _('Releases')
= render_if_exists 'projects/sidebar/security_dashboard'
= render_if_exists 'projects/sidebar/dependencies'
- if can?(current_user, :read_cycle_analytics, @project) - if can?(current_user, :read_cycle_analytics, @project)
= nav_link(path: 'cycle_analytics#show') do = nav_link(path: 'cycle_analytics#show') do
= link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do
...@@ -203,6 +199,8 @@ ...@@ -203,6 +199,8 @@
%span %span
= _('Charts') = _('Charts')
= render_if_exists 'layouts/nav/sidebar/project_security_link' # EE-specific
- if project_nav_tab? :operations - if project_nav_tab? :operations
= nav_link(controller: sidebar_operations_paths) do = nav_link(controller: sidebar_operations_paths) do
= link_to sidebar_operations_link_path, class: 'shortcuts-operations qa-link-operations' do = link_to sidebar_operations_link_path, class: 'shortcuts-operations qa-link-operations' 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