diff options
author | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-27 08:01:59 +0000 |
---|---|---|
committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-03-27 08:01:59 +0000 |
commit | 581b839fe557f0e026004d7064829f1167646838 (patch) | |
tree | 9cec554197fcf1b07826f009e259f5705090e385 /app | |
parent | ceb3f1036ce063a70c155df64490c95355876882 (diff) | |
parent | ad9e19b869ccd1a73f04ad30922e10f7005b3958 (diff) | |
download | gitlab-ce-581b839fe557f0e026004d7064829f1167646838.tar.gz |
Merge branch 'ce-insights-frontend' into 'master'
CE: Insights Frontend
See merge request gitlab-org/gitlab-ce!26284
Diffstat (limited to 'app')
-rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 2 | ||||
-rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index eefe86eb6b4..b950e53639a 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -45,6 +45,8 @@ %span = _('Contribution Analytics') + = render_if_exists 'layouts/nav/group_insights_link' + = render_if_exists "layouts/nav/ee/epic_link", group: @group - if group_sidebar_link?(:issues) diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 7b492efeb09..6b33189d1cf 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -41,6 +41,8 @@ = link_to project_cycle_analytics_path(@project), title: _('Cycle Analytics'), class: 'shortcuts-project-cycle-analytics' do %span= _('Cycle Analytics') + = render_if_exists 'layouts/nav/project_insights_link' + - if project_nav_tab? :files = nav_link(controller: sidebar_repository_paths) do = link_to project_tree_path(@project), class: 'shortcuts-tree qa-project-menu-repo' do |