Merge pull request #6258 from zzet/patch-6

Add emoji images to asset load path.

config/application.rb

@@ -62,7 +62,9 @@ module Gitlab
 
     # Enable the asset pipeline
     config.assets.enabled = true
-
+    config.assets.paths << Emoji.images_path
+    config.assets.precompile << "emoji/*.png"
+    
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'