diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index d27f4de3851d9ed2af0863024ac0c77452ff6f3d..a4d36c9bbc88566a9f83184f7122d8e3bf677b35 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 ba993abf7f72fdf153b000e82867868c65d5845d..f88d1aed080773c95d18bd888690d9217f414402 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