diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-18 11:28:47 +0400 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2012-10-18 11:28:47 +0400 |
| commit | c0073254510f4dd033b3c313f90ec7653e5db4bb (patch) | |
| tree | 37646117d691059455f1a6de77d0522be0891fbd /app | |
| parent | 61e5fb6f370bc336799211d311131132a2159906 (diff) | |
| parent | ce91014730e59101af3dd52ae7cd6f3070954fa4 (diff) | |
Merge pull request #1712 from riyad/use-gem-for-emoji
Use gem for Emoji
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/application_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d27f4de3851..a4d36c9bbc8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -115,7 +115,7 @@ module ApplicationHelper def emoji_autocomplete_source # should be an array of strings # so to_s can be called, because it is sufficient and to_json is too slow - Emoji::NAMES.to_s + Emoji.names.to_s end def ldap_enable? |