diff options
author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 11:11:02 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-02-19 18:29:55 +0300 |
commit | da0953e65273b1346567dff09518c3eeb7463c6f (patch) | |
tree | fcad5a5cbdea1f3f23c88f96a3b72e34c373f79b /lib/banzai/filter/emoji_filter.rb | |
parent | f30004819a7c15ad53a863c9648b7d687c5af405 (diff) |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
![Screen_Shot_2016-02-12_at_3.38.43_PM](/uploads/299e5ffe38c91657085741261a678f81/Screen_Shot_2016-02-12_at_3.38.43_PM.png) | ![Screen_Shot_2016-02-12_at_3.38.09_PM](/uploads/ccee29719a6445a9efd2498391a7eea0/Screen_Shot_2016-02-12_at_3.38.09_PM.png)
See merge request !2800
Diffstat (limited to 'lib/banzai/filter/emoji_filter.rb')
-rw-r--r-- | lib/banzai/filter/emoji_filter.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/banzai/filter/emoji_filter.rb b/lib/banzai/filter/emoji_filter.rb index 5952a031626..207437ba7cf 100644 --- a/lib/banzai/filter/emoji_filter.rb +++ b/lib/banzai/filter/emoji_filter.rb @@ -45,7 +45,8 @@ module Banzai private def emoji_url(name) - emoji_path = "emoji/#{emoji_filename(name)}" + emoji_path = emoji_filename(name) + if context[:asset_host] # Asset host is specified. url_to_image(emoji_path) |