diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-02-19 11:11:02 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-02-19 11:11:02 +0300 |
| commit | ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch) | |
| tree | 3097d416524866e13efc21bbb9e1c441cac0a9f9 /lib/banzai | |
| parent | cb0b7de48267abee85d39571ae55a0e988cc21eb (diff) | |
| parent | 20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff) | |
Merge branch 'rs-emoji' into 'master'
Update Gemojione for new hotness :sparkles:
Before | After
------ | -----
 | 
See merge request !2800
Diffstat (limited to 'lib/banzai')
| -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) |