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:
commit
57074d606b
1 changed files with 1 additions and 1 deletions
|
@ -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}",
|
||||
|
|
Loading…
Reference in a new issue