From ce91014730e59101af3dd52ae7cd6f3070954fa4 Mon Sep 17 00:00:00 2001 From: Riyad Preukschas Date: Tue, 16 Oct 2012 16:26:40 +0200 Subject: [PATCH] Fix use of Emoji --- app/helpers/application_helper.rb | 2 +- lib/gitlab/markdown.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d27f4de..a4d36c9 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? diff --git a/lib/gitlab/markdown.rb b/lib/gitlab/markdown.rb index ba993ab..f88d1ae 100644 --- 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 -- libgit2 0.21.2