summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2019-06-21 12:55:24 +0000
committerFilipa Lacerda <filipa@gitlab.com>2019-06-21 12:55:24 +0000
commitfcdeddc6f7ee3f66284d05d3f4bd5ef274c5823d (patch)
treeaee394605c586c4b16bb8a9924a314d9ed42aab8
parent004b0db111d1507c3d683d0d0e647d9e615ed1c4 (diff)
parent05c139c63f0baf8b3cd0062872d331cdbf33830d (diff)
downloadgitlab-ce-fcdeddc6f7ee3f66284d05d3f4bd5ef274c5823d.tar.gz
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
-rw-r--r--app/views/layouts/nav/sidebar/_group.html.haml3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml
index 0fc5ebbea7e..4b5ccc33716 100644
--- a/app/views/layouts/nav/sidebar/_group.html.haml
+++ b/app/views/layouts/nav/sidebar/_group.html.haml
@@ -45,7 +45,6 @@
= _('Contribution Analytics')
= 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
@@ -119,6 +118,8 @@
%strong.fly-out-top-item-name
= _('Kubernetes')
+ = render_if_exists 'groups/sidebar/packages' # EE-specific
+
- if group_sidebar_link?(:group_members)
= nav_link(path: 'group_members#index') do
= link_to group_group_members_path(@group) do