diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-04 13:14:29 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-01-04 13:14:29 +0000 |
| commit | 57074d606b20516921ff2297e2f94262b58e3d3e (patch) | |
| tree | 4d06a22ddd8ea93a12471d622a78b9f691df5abc | |
| parent | b9ec1aaec8c94795b92623ec85da4ba5be286c46 (diff) | |
| parent | 4c5be69583a61b9cce40b43dc93f00e1ae909680 (diff) | |
| download | gitlab-ce-57074d606b20516921ff2297e2f94262b58e3d3e.tar.gz | |
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
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
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}", |