Commit 71a39655b4ce1e66b4e2a7fc8ffa36fbc06901c6
Exists in
spb-stable
and in
3 other branches
Merge pull request #6258 from zzet/patch-6
Add emoji images to asset load path.
Showing
1 changed file
with
3 additions
and
1 deletions
Show diff stats
config/application.rb
| @@ -62,7 +62,9 @@ module Gitlab | @@ -62,7 +62,9 @@ module Gitlab | ||
| 62 | 62 | ||
| 63 | # Enable the asset pipeline | 63 | # Enable the asset pipeline |
| 64 | config.assets.enabled = true | 64 | config.assets.enabled = true |
| 65 | - | 65 | + config.assets.paths << Emoji.images_path |
| 66 | + config.assets.precompile << "emoji/*.png" | ||
| 67 | + | ||
| 66 | # Version of your assets, change this if you want to expire all your assets | 68 | # Version of your assets, change this if you want to expire all your assets |
| 67 | config.assets.version = '1.0' | 69 | config.assets.version = '1.0' |
| 68 | 70 |