Commit 57074d60 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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
parents b9ec1aae 4c5be695
...@@ -99,7 +99,7 @@ module IssuesHelper ...@@ -99,7 +99,7 @@ module IssuesHelper
end end
def emoji_icon(name, unicode = nil, aliases = []) def emoji_icon(name, unicode = nil, aliases = [])
unicode ||= Emoji.emoji_filename(name) unicode ||= Emoji.emoji_filename(name) rescue ""
content_tag :div, "", content_tag :div, "",
class: "icon emoji-icon emoji-#{unicode}", class: "icon emoji-icon emoji-#{unicode}",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment