diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-20 10:18:34 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-20 10:18:34 +0000 |
| commit | 261698f09b9824d6d58c8258f1641251dbaaae17 (patch) | |
| tree | c5a831993ecd2db228e156673cef30da41b2e05c /app/helpers | |
| parent | b96fa3094affbe0787a7419341c9432fb2dd6266 (diff) | |
| parent | f31ee525070d335aba8a189b304e3c446aedf1fb (diff) | |
| download | gitlab-ce-261698f09b9824d6d58c8258f1641251dbaaae17.tar.gz | |
Merge branch 'notes_fix_stable' into 'master'
Fix for Emoji
See merge request !1849
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/issues_helper.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb index 2c791aa5682..493f370d9a9 100644 --- a/app/helpers/issues_helper.rb +++ b/app/helpers/issues_helper.rb @@ -90,6 +90,8 @@ module IssuesHelper def url_to_emoji(name) emoji_path = ::AwardEmoji.path_to_emoji_image(name) url_to_image(emoji_path) + rescue StandardError + "" end def emoji_author_list(notes, current_user) |