From f88607923afd5a2adfb7a28df297528cbb27885b Mon Sep 17 00:00:00 2001 From: Jan Provaznik Date: Thu, 4 Apr 2019 15:34:55 +0200 Subject: Fix scoped_labels feature check Check this feature per project/group instead of globally. Also do not show tooltip if it's disabled. --- app/views/shared/issuable/_sidebar.html.haml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/views/shared') diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index 3c205c0b5a1..0798b1da4b7 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -106,8 +106,7 @@ .value.issuable-show-labels.dont-hide.hide-collapsed.qa-labels-block{ class: ("has-labels" if selected_labels.any?) } - if selected_labels.any? - selected_labels.each do |label_hash| - - label = Label.new(label_hash.slice(:color, :description, :title)) - = render_label(label, link: sidebar_label_filter_path(issuable_sidebar[:project_issuables_path], label[:title])) + = render_label(label_from_hash(label_hash), link: sidebar_label_filter_path(issuable_sidebar[:project_issuables_path], label_hash[:title])) - else %span.no-value = _('None') -- cgit v1.2.1