Commit 5a9b6b5e authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch 'group-contribution-analytics-new-nav' into 'master'

Added group contribution analytics to new sidebar

Closes #3063 and gitlab-ce#35824

See merge request !2565
parents a770e807 7eb4de25
......@@ -9,7 +9,7 @@
%span.sr-only Close sidebar
= icon ('times')
%ul.sidebar-top-level-items
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups'], html_options: { class: 'home' }) do
= nav_link(path: ['groups#show', 'groups#activity', 'groups#subgroups', 'analytics#show'], html_options: { class: 'home' }) do
= link_to group_path(@group), title: 'About group' do
%span
About
......@@ -25,6 +25,12 @@
%span
Activity
- if @group.feature_available?(:contribution_analytics)
= nav_link(path: 'analytics#show') do
= link_to group_analytics_path(@group), title: 'Contribution Analytics', data: {placement: 'right'} do
%span
Contribution Analytics
= nav_link(path: ['groups#issues', 'labels#index', 'milestones#index']) do
= link_to issues_group_path(@group), title: 'Issues' do
%span
......
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