Merge branch 'stabilize_emoji' into 'master'

Catch Emoji name lookup error

This is a first part of the fix https://gitlab.com/gitlab-org/gitlab-ce/issues/5829

See merge request !2282
This commit is contained in:
Dmitriy Zaporozhets 2016-01-04 13:14:29 +00:00
commit 57074d606b

View file

@ -99,7 +99,7 @@ module IssuesHelper
end
def emoji_icon(name, unicode = nil, aliases = [])
unicode ||= Emoji.emoji_filename(name)
unicode ||= Emoji.emoji_filename(name) rescue ""
content_tag :div, "",
class: "icon emoji-icon emoji-#{unicode}",