Merge branch 'dz-group-packages-page-ce' into 'master'

Add packages nav to group sidebar [CE backport]

See merge request gitlab-org/gitlab-ce!29592
This commit is contained in:
Filipa Lacerda 2019-06-21 12:55:24 +00:00
commit fcdeddc6f7

View file

@ -45,7 +45,6 @@
= _('Contribution Analytics') = _('Contribution Analytics')
= render_if_exists 'layouts/nav/group_insights_link' = render_if_exists 'layouts/nav/group_insights_link'
= render_if_exists 'groups/sidebar/dependency_proxy' # EE-specific
= render_if_exists "layouts/nav/ee/epic_link", group: @group = render_if_exists "layouts/nav/ee/epic_link", group: @group
@ -119,6 +118,8 @@
%strong.fly-out-top-item-name %strong.fly-out-top-item-name
= _('Kubernetes') = _('Kubernetes')
= render_if_exists 'groups/sidebar/packages' # EE-specific
- if group_sidebar_link?(:group_members) - if group_sidebar_link?(:group_members)
= nav_link(path: 'group_members#index') do = nav_link(path: 'group_members#index') do
= link_to group_group_members_path(@group) do = link_to group_group_members_path(@group) do