diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-04-04 15:34:55 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-04-04 19:34:14 +0200 |
| commit | f88607923afd5a2adfb7a28df297528cbb27885b (patch) | |
| tree | 3415bd1d40ae6bd92c37ac434473c2066dea5f2e /app/views/shared | |
| parent | fec2e27f1dcbb806247d6f78ebae628622c02d52 (diff) | |
| download | gitlab-ce-f88607923afd5a2adfb7a28df297528cbb27885b.tar.gz | |
Fix scoped_labels feature check
Check this feature per project/group instead of globally.
Also do not show tooltip if it's disabled.
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 3 |
1 files changed, 1 insertions, 2 deletions
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') |