Fix use of Emoji

2012-10-16 16:26:40 +02:00 · 2012-10-16 16:26:40 +02:00 · ce91014730
commit ce91014730
parent 5d42d92c87
2 changed files with 2 additions and 2 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?
--- a/lib/gitlab/markdown.rb
+++ b/lib/gitlab/markdown.rb
@ -128,7 +128,7 @@ module Gitlab
    #
    # Returns boolean
    def valid_emoji?(emoji)
-      Emoji::NAMES.include? emoji
+      Emoji.names.include? emoji
    end

    # Private: Dispatches to a dedicated processing method based on reference