Merge pull request #1712 from riyad/use-gem-for-emoji

Use gem for Emoji
2012-10-18 00:28:47 -07:00 · 2012-10-18 00:28:47 -07:00 · c007325451
commit c007325451
parent 61e5fb6f37 ce91014730
852 changed files with 5 additions and 6 deletions
--- 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?