Read about our upcoming Code of Conduct on this issue

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

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
......@@ -99,7 +99,7 @@ def merge_requests_sentence(merge_requests)
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}",
......
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