diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:20 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-12 15:34:20 -0500 |
| commit | fe13f58f3e876e3329ca246db737268bf5b15000 (patch) | |
| tree | ba60ea1779c8ce63cf60a7df830cc62c01312e5e /lib/banzai | |
| parent | f9bf87bbe812a9ea183f1746c0d7bd82cc8423f4 (diff) | |
| download | gitlab-ce-fe13f58f3e876e3329ca246db737268bf5b15000.tar.gz | |
Update Emoji asset path
Now that we're serving assets directly from the Gemojione gem's path,
the images are not in an `emoji/` sub-folder.
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) |