summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-19 08:11:02 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-19 08:11:02 +0000
commitad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb (patch)
tree3097d416524866e13efc21bbb9e1c441cac0a9f9 /lib
parentcb0b7de48267abee85d39571ae55a0e988cc21eb (diff)
parent20fcc5d6f602354fe9d4c1c811496798a053f7ba (diff)
downloadgitlab-ce-ad12f11f3ed81637b4d72ce9e494fdbd1f26b1bb.tar.gz
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')
-rw-r--r--lib/banzai/filter/emoji_filter.rb3
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)