Merge pull request #6258 from zzet/patch-6

Add emoji images to asset load path.

Merge pull request #6258 from zzet/patch-6
Add emoji images to asset load path.
Dmitriy Zaporozhets
2 parents d41e404e e139cc9e
Showing 1 changed file with 3 additions and 1 deletions Show diff stats
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'
...	...	@@ -62,7 +62,9 @@ module Gitlab
62	62
63	63	# Enable the asset pipeline
64	64	config.assets.enabled = true
65		-
	65	+ config.assets.paths << Emoji.images_path
	66	+ config.assets.precompile << "emoji/*.png"
	67	+
66	68	# Version of your assets, change this if you want to expire all your assets
67	69	config.assets.version = '1.0'
68	70
...	...