deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix use of Emoji

Browse source
This commit is contained in:
Riyad Preukschas 2012-10-16 16:26:40 +02:00
parent 5d42d92c87
commit ce91014730
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/helpers/application_helper.rb
View file

@ -115,7 +115,7 @@ module ApplicationHelper
def emoji_autocomplete_source def emoji_autocomplete_source
# should be an array of strings # should be an array of strings
# so to_s can be called, because it is sufficient and to_json is too slow # 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 end
def ldap_enable? def ldap_enable?

2
lib/gitlab/markdown.rb
View file

@ -128,7 +128,7 @@ module Gitlab
# #
# Returns boolean # Returns boolean
def valid_emoji?(emoji) def valid_emoji?(emoji)
Emoji::NAMES.include? emoji Emoji.names.include? emoji
end end
# Private: Dispatches to a dedicated processing method based on reference # Private: Dispatches to a dedicated processing method based on reference