Merge pull request #1712 from riyad/use-gem-for-emoji

Use gem for Emoji

lib/emoji.rb

@@ -1,4 +0,0 @@
-module Emoji
-  path  = "#{Rails.root}/vendor/assets/images/emoji"
-  NAMES = Dir["#{path}/*.png"].sort.map {|f| File.basename(f, '.png')}
-end

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