diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2019-07-24 11:29:07 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2019-07-24 11:29:07 +0000 |
| commit | a34654f3741befe84892dfd0be2a77acb9b57d91 (patch) | |
| tree | 91e2daeb5118a78322e9b7d23ecc8372379620a9 | |
| parent | 642253b7c769bc9e1b0e4b7890698aa4cb6dbde0 (diff) | |
| parent | 5b1598191750ed8926b42365abf37a2a277a5d81 (diff) | |
| download | gitlab-ce-a34654f3741befe84892dfd0be2a77acb9b57d91.tar.gz | |
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
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 8caae5eed83..d1634eb62c0 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -34,10 +34,6 @@ = link_to project_releases_path(@project), title: _('Releases'), class: 'shortcuts-project-releases' do %span= _('Releases') - = render_if_exists 'projects/sidebar/security_dashboard' - - = render_if_exists 'projects/sidebar/dependencies' - - if can?(current_user, :read_cycle_analytics, @project) = nav_link(path: 'cycle_analytics#show') do = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do @@ -203,6 +199,8 @@ %span = _('Charts') + = render_if_exists 'layouts/nav/sidebar/project_security_link' # EE-specific + - if project_nav_tab? :operations = nav_link(controller: sidebar_operations_paths) do = link_to sidebar_operations_link_path, class: 'shortcuts-operations qa-link-operations' do |