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

Merge branch 'stabilize_emoji' into 'master'
57074d60 · Dmitriy Zaporozhets · b9ec1aae · 4c5be695 · 57074d60
Commit 57074d60 authored Jan 04, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

issues_helper.rb app/helpers/issues_helper.rb +1 -1

No files found.
--- 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}",