summaryrefslogtreecommitdiff
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-12-24 11:28:51 +0200
committerValery Sizov <vsv2711@gmail.com>2015-12-24 11:28:55 +0200
commitb6de0d28303a12c76847f1137e672aa60ae174ac (patch)
tree11ff97f14046b8d6445a6695fea00ab7c3e158e2 /app/helpers/issues_helper.rb
parent2803b6e84e94bb3a8d85ea9e29aeade450c842a7 (diff)
downloadgitlab-ce-b6de0d28303a12c76847f1137e672aa60ae174ac.tar.gz
Emoji picker: better alias handling
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 2bcde9c2ba3..4fe84322199 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -94,12 +94,13 @@ module IssuesHelper
end.sort.to_sentence(last_word_connector: ', or ')
end
- def emoji_icon(name, unicode = nil)
+ def emoji_icon(name, unicode = nil, aliases = [])
unicode ||= Emoji.emoji_filename(name)
content_tag :div, "",
class: "icon emoji-icon emoji-#{unicode}",
"data-emoji" => name,
+ "data-aliases" => aliases.join(" "),
"data-unicode-name" => unicode
end