diff options
| author | Jan Provaznik <jprovaznik@gitlab.com> | 2019-04-02 12:48:20 +0200 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2019-04-04 08:07:58 +0200 |
| commit | fec2e27f1dcbb806247d6f78ebae628622c02d52 (patch) | |
| tree | 28c1fdcc333629d6de8324c0a02fb12066d73543 /app/views/shared/milestones | |
| parent | 97ab8539968d52b709cd61c2dd4229d404903e14 (diff) | |
| download | gitlab-ce-fec2e27f1dcbb806247d6f78ebae628622c02d52.tar.gz | |
[backend] backport of scoped labels
Scoped labels in EE require additional changes in CE code.
Diffstat (limited to 'app/views/shared/milestones')
| -rw-r--r-- | app/views/shared/milestones/_issuable.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_labels_tab.html.haml | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/views/shared/milestones/_issuable.html.haml b/app/views/shared/milestones/_issuable.html.haml index eba64daaadc..57c0de2e9bc 100644 --- a/app/views/shared/milestones/_issuable.html.haml +++ b/app/views/shared/milestones/_issuable.html.haml @@ -22,7 +22,7 @@ - labels.each do |label| = link_to polymorphic_path(issuable_type_args, { milestone_title: @milestone.title, label_name: label.title, state: 'all' }) do - - render_colored_label(label) + - render_label(label) %span.assignee-icon - assignees.each do |assignee| diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml index 6797520650d..6b0640bd8cb 100644 --- a/app/views/shared/milestones/_labels_tab.html.haml +++ b/app/views/shared/milestones/_labels_tab.html.haml @@ -5,8 +5,7 @@ %li.is-not-draggable %span.label-row %span.label-name - = link_to milestones_label_path(options) do - - render_colored_label(label, tooltip: false) + = render_label(label, tooltip: false, link: milestones_label_path(options)) %span.prepend-description-left = markdown_field(label, :description) |