Commit 00e80a29 authored by Luke Bennett's avatar Luke Bennett

Correct merge

parent 8ed0267f
......@@ -11,7 +11,7 @@
%li.label-list-item{ id: label_css_id, data: { id: label.id } }
= render "shared/label_row", label: label, subject: subject, force_priority: force_priority
.d-inline-block.d-sm-none.dropdown
%ul.label-actions-list
- if @project
%li.inline
.label-badge.label-badge-gray= label.model_name.human.capitalize
......
......@@ -11,17 +11,19 @@
- if label.description.present?
.description-text.append-bottom-10
= markdown_field(label, :description)
.d-none.d-sm-none.d-md-block
%ul.label-links
- if show_label_epics_link
%li.label-link-item.inline
= link_to 'Epics', group_epics_path(@group, label_name:[label.name])
·
- if show_label_issues_link
%li.label-link-item.inline
= link_to_label(label, subject: subject) { 'Issues' }
- if show_label_merge_requests_link
·
- if show_label_merge_requests_link
%li.label-link-item.inline
= link_to_label(label, subject: subject, type: :merge_request) { _('Merge requests') }
·
- if force_priority
%li.label-link-item.js-priority-badge.inline.prepend-left-10
.label-badge.label-badge-blue= _('Prioritized label')
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment