diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 14:59:33 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-13 14:59:33 +0200 |
| commit | 71a39655b4ce1e66b4e2a7fc8ffa36fbc06901c6 (patch) | |
| tree | 6a6dbdf508f3afe91df47d180f6d988b543beef8 /config | |
| parent | d41e404e09c79394ff1938eee01b56345edc6ed9 (diff) | |
| parent | e139cc9e33810203fe3ac298ad6649cdbcd79f87 (diff) | |
| download | gitlab-ce-71a39655b4ce1e66b4e2a7fc8ffa36fbc06901c6.tar.gz | |
Merge pull request #6258 from zzet/patch-6
Add emoji images to asset load path.
Diffstat (limited to 'config')
| -rw-r--r-- | config/application.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index 88759ce7cf3..c53257090cf 100644 --- 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' |