summaryrefslogtreecommitdiff
path: root/app/helpers/issues_helper.rb
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2016-01-04 14:06:48 +0200
committerValery Sizov <vsv2711@gmail.com>2016-01-04 14:06:48 +0200
commit4c5be69583a61b9cce40b43dc93f00e1ae909680 (patch)
tree4d06a22ddd8ea93a12471d622a78b9f691df5abc /app/helpers/issues_helper.rb
parentb9ec1aaec8c94795b92623ec85da4ba5be286c46 (diff)
downloadgitlab-ce-4c5be69583a61b9cce40b43dc93f00e1ae909680.tar.gz
catch Emoji encode error
Diffstat (limited to 'app/helpers/issues_helper.rb')
-rw-r--r--app/helpers/issues_helper.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 80e2741b09a..c12456a187f 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -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}",