diff options
| -rw-r--r-- | app/views/groups/labels/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/groups/labels/index.html.haml b/app/views/groups/labels/index.html.haml index 9c31bbee295..db7eaff6658 100644 --- a/app/views/groups/labels/index.html.haml +++ b/app/views/groups/labels/index.html.haml @@ -22,7 +22,7 @@ - if can_admin_label %h5{ class: ('hide' if hide) } Labels %ul.content-list.manage-labels-list.js-other-labels - = render partial: 'shared/label', subject: @group, collection: @labels, as: :label, locals: { use_label_priority: true } + = render partial: 'shared/label', subject: @group, collection: @labels, as: :label, locals: { use_label_priority: false } = paginate @labels, theme: 'gitlab' - else = render 'shared/empty_states/labels' diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 4725951b22d..c34d63ba5c3 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -2,7 +2,7 @@ - status = label_subscription_status(label, @project).inquiry if current_user - subject = local_assigns[:subject] - use_label_priority = local_assigns.fetch(:use_label_priority, false) -- force_priority = local_assigns.fetch(:force_priority, use_label_priority ? label.priority? : false) +- force_priority = local_assigns.fetch(:force_priority, use_label_priority ? label.priority.present? : false) - toggle_subscription_path = toggle_subscription_label_path(label, @project) if current_user - show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project) - show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project) |