diff options
| author | Phil Hughes <me@iamphill.com> | 2019-05-22 07:36:59 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2019-05-22 07:36:59 +0000 |
| commit | acd7e9e68c412fc500d85665ee582afba8cd9ebe (patch) | |
| tree | f850ea3f1cd2902e64da0f8a6ad30c7375207d31 | |
| parent | fc970b2c6270e3eff9da72a8f76d9b3d0cf05f00 (diff) | |
| parent | f794bded6834768cb339b58ad40946457a989da2 (diff) | |
| download | gitlab-ce-acd7e9e68c412fc500d85665ee582afba8cd9ebe.tar.gz | |
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
| -rw-r--r-- | app/views/shared/_label_row.html.haml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index a1aab2e6a08..af11ce94ec5 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -22,3 +22,4 @@ · %li.label-link-item.priority-badge.js-priority-badge.inline.prepend-left-10 .label-badge.label-badge-blue= _('Prioritized label') + = render_if_exists 'shared/label_row_epics_link', label: label |