diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 15:10:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-28 15:10:41 +0300 |
commit | b1e352740bd52771b419829abef0a0ad73141ac1 (patch) | |
tree | e86202376eb85b6314ab90fe028c0889098b05ef /app/views/layouts/nav/sidebar | |
parent | aeee5b6a212eafefe3c994fb3731ccfca590a6ba (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/layouts/nav/sidebar')
-rw-r--r-- | app/views/layouts/nav/sidebar/_group_menus.html.haml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/app/views/layouts/nav/sidebar/_group_menus.html.haml b/app/views/layouts/nav/sidebar/_group_menus.html.haml index 085e660bae7..5706613c697 100644 --- a/app/views/layouts/nav/sidebar/_group_menus.html.haml +++ b/app/views/layouts/nav/sidebar/_group_menus.html.haml @@ -1,20 +1,3 @@ -- merge_requests_count = cached_issuables_count(@group, type: :merge_requests) - -- if group_sidebar_link?(:merge_requests) - = nav_link(path: 'groups#merge_requests') do - = link_to merge_requests_group_path(@group) do - .nav-icon-container - = sprite_icon('git-merge') - %span.nav-item-name - = _('Merge requests') - %span.badge.badge-pill.count= merge_requests_count - %ul.sidebar-sub-level-items.is-fly-out-only - = nav_link(path: 'groups#merge_requests', html_options: { class: "fly-out-top-item" } ) do - = link_to merge_requests_group_path(@group) do - %strong.fly-out-top-item-name - = _('Merge requests') - %span.badge.badge-pill.count.merge_counter.js-merge-counter.fly-out-badge= merge_requests_count - = render_if_exists "layouts/nav/ee/security_link" # EE-specific = render_if_exists "layouts/nav/ee/push_rules_link" # EE-specific |