summaryrefslogtreecommitdiff
path: root/app/helpers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 21:06:28 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 21:06:28 +0000
commiteb7390edf3afd52174b786fff1e06d5ffae0cec5 (patch)
tree395dce44e5ea2b55704414e4d38fc24da4b1b676 /app/helpers
parent801ced25ff0540b096c395f9ac8d2d9e005878e8 (diff)
downloadgitlab-ce-eb7390edf3afd52174b786fff1e06d5ffae0cec5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/helpers')
-rw-r--r--app/helpers/labels_helper.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/labels_helper.rb b/app/helpers/labels_helper.rb
index 3a872622e73..0d3cf4d73fb 100644
--- a/app/helpers/labels_helper.rb
+++ b/app/helpers/labels_helper.rb
@@ -47,11 +47,11 @@ module LabelsHelper
end
end
- def render_label(label, tooltip: true, link: nil, css: nil)
+ def render_label(label, tooltip: true, link: nil, css: nil, dataset: nil)
# if scoped label is used then EE wraps label tag with scoped label
# doc link
html = render_colored_label(label, tooltip: tooltip)
- html = link_to(html, link, class: css) if link
+ html = link_to(html, link, class: css, data: dataset) if link
html
end