Fix use of Emoji

Riyad Preukschas
1 parent 5d42d92c
Showing 2 changed files with 2 additions and 2 deletions Show diff stats
app/helpers/application_helper.rb
lib/gitlab/markdown.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?
@@ -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
...	...	@@ -115,7 +115,7 @@ module ApplicationHelper
115	115	def emoji_autocomplete_source
116	116	# should be an array of strings
117	117	# so to_s can be called, because it is sufficient and to_json is too slow
118		- Emoji::NAMES.to_s
	118	+ Emoji.names.to_s
119	119	end
120	120
121	121	def ldap_enable?
...	...
...	...	@@ -128,7 +128,7 @@ module Gitlab
128	128	#
129	129	# Returns boolean
130	130	def valid_emoji?(emoji)
131		- Emoji::NAMES.include? emoji
	131	+ Emoji.names.include? emoji
132	132	end
133	133
134	134	# Private: Dispatches to a dedicated processing method based on reference
...	...