Commit acd7e9e6 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'label-row-scb' into 'master'

Resolve CE/EE diffs in label row

Closes gitlab-ee#10493

See merge request gitlab-org/gitlab-ce!28551
parents fc970b2c f794bded
...@@ -22,3 +22,4 @@ ...@@ -22,3 +22,4 @@
· ·
%li.label-link-item.priority-badge.js-priority-badge.inline.prepend-left-10 %li.label-link-item.priority-badge.js-priority-badge.inline.prepend-left-10
.label-badge.label-badge-blue= _('Prioritized label') .label-badge.label-badge-blue= _('Prioritized label')
= render_if_exists 'shared/label_row_epics_link', label: 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