diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 18:06:49 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-03 18:06:49 +0000 |
commit | ab7cf450ba19cf80b9534f25dc707b33845e3014 (patch) | |
tree | bbfa6aba83c48aea68d79c4179ce576b6eec326d /app/views/layouts/nav | |
parent | 4204cf308596e0e26f578a6e2da88f49c0f4aad9 (diff) | |
download | gitlab-ce-ab7cf450ba19cf80b9534f25dc707b33845e3014.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav')
-rw-r--r-- | app/views/layouts/nav/_dashboard.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_instance_statistics.html.haml | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/views/layouts/nav/_dashboard.html.haml b/app/views/layouts/nav/_dashboard.html.haml index d339751848b..9a839765286 100644 --- a/app/views/layouts/nav/_dashboard.html.haml +++ b/app/views/layouts/nav/_dashboard.html.haml @@ -48,7 +48,7 @@ %li.dropdown = render_if_exists 'dashboard/nav_link_list' - if can?(current_user, :read_instance_statistics) - = nav_link(controller: [:conversational_development_index, :cohorts]) do + = nav_link(controller: [:dev_ops_score, :cohorts]) do = link_to instance_statistics_root_path do = _('Instance Statistics') - if current_user.admin? diff --git a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml index 57180f27146..6a5f727bb48 100644 --- a/app/views/layouts/nav/sidebar/_instance_statistics.html.haml +++ b/app/views/layouts/nav/sidebar/_instance_statistics.html.haml @@ -6,15 +6,15 @@ = sprite_icon('chart', size: 24) .sidebar-context-title= _('Instance Statistics') %ul.sidebar-top-level-items - = nav_link(controller: :conversational_development_index) do - = link_to instance_statistics_conversational_development_index_index_path do + = nav_link(controller: :dev_ops_score) do + = link_to instance_statistics_dev_ops_score_index_path do .nav-icon-container = sprite_icon('comment') %span.nav-item-name = _('ConvDev Index') %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(controller: :conversational_development_index, html_options: { class: "fly-out-top-item" } ) do - = link_to instance_statistics_conversational_development_index_index_path do + = nav_link(controller: :dev_ops_score, html_options: { class: "fly-out-top-item" } ) do + = link_to instance_statistics_dev_ops_score_index_path do %strong.fly-out-top-item-name = _('ConvDev Index') |