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.
71a39655 · Dmitriy Zaporozhets · d41e404e · e139cc9e · 71a39655
Commit 71a39655 authored Feb 13, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

config/application.rb config/application.rb +3 -1

No files found.
--- a/config/application.rb
+++ b/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'