Update project sidebar to work with EE feature Security Dashboard
This commit is contained in:
parent
0003af6c68
commit
a2e641a67d
|
@ -506,6 +506,14 @@ module ProjectsHelper
|
|||
end
|
||||
end
|
||||
|
||||
def sidebar_projects_paths
|
||||
%w[
|
||||
projects#show
|
||||
projects#activity
|
||||
cycle_analytics#show
|
||||
]
|
||||
end
|
||||
|
||||
def sidebar_settings_paths
|
||||
%w[
|
||||
projects#edit
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
.sidebar-context-title
|
||||
= @project.name
|
||||
%ul.sidebar-top-level-items
|
||||
= nav_link(path: ['projects#show', 'projects#activity', 'cycle_analytics#show'], html_options: { class: 'home' }) do
|
||||
= nav_link(path: sidebar_projects_paths, html_options: { class: 'home' }) do
|
||||
= link_to project_path(@project), class: 'shortcuts-project' do
|
||||
.nav-icon-container
|
||||
= sprite_icon('project')
|
||||
|
@ -29,13 +29,13 @@
|
|||
= link_to activity_project_path(@project), title: _('Activity'), class: 'shortcuts-project-activity' do
|
||||
%span= _('Activity')
|
||||
|
||||
= render_if_exists 'projects/sidebar/security_dashboard'
|
||||
|
||||
- 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
|
||||
%span= _('Cycle Analytics')
|
||||
|
||||
= render_if_exists 'projects/sidebar/security_dashboard'
|
||||
|
||||
- if project_nav_tab? :files
|
||||
= nav_link(controller: sidebar_repository_paths) do
|
||||
= link_to project_tree_path(@project), class: 'shortcuts-tree' do
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
"webpack-prod": "NODE_ENV=production webpack --config config/webpack.config.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@gitlab-org/gitlab-svgs": "^1.23.0",
|
||||
"@gitlab-org/gitlab-svgs": "^1.24.0",
|
||||
"autosize": "^4.0.0",
|
||||
"axios": "^0.17.1",
|
||||
"babel-core": "^6.26.3",
|
||||
|
|
|
@ -78,9 +78,9 @@
|
|||
lodash "^4.2.0"
|
||||
to-fast-properties "^2.0.0"
|
||||
|
||||
"@gitlab-org/gitlab-svgs@^1.23.0":
|
||||
version "1.23.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.23.0.tgz#42047aeedcc06bc12d417ed1efadad1749af9670"
|
||||
"@gitlab-org/gitlab-svgs@^1.24.0":
|
||||
version "1.24.0"
|
||||
resolved "https://registry.yarnpkg.com/@gitlab-org/gitlab-svgs/-/gitlab-svgs-1.24.0.tgz#3b2b58c5a1d58ce784f486d648bd87cbbb06cedc"
|
||||
|
||||
"@sindresorhus/is@^0.7.0":
|
||||
version "0.7.0"
|
||||
|
|
Loading…
Reference in New Issue