diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-02 15:16:12 +0300 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-07-02 15:16:12 +0300 |
commit | f56c4fadc954baca238a31cdd15d96aa87cf0346 (patch) | |
tree | b1048f120ea7c228e970ddb26039c9f241765efb | |
parent | 7e9f46d0dc1ed34d7e7cb7b6ee31d08f53f2deaf (diff) | |
parent | 972248b6026fdd9c27d9fedd526f5631cdc89816 (diff) |
Merge branch 'dm-emoji-filtter-comment' into 'master'
Remove outdated comment from emoji_filter.rb
See merge request gitlab-org/gitlab-ce!20306
-rw-r--r-- | lib/banzai/filter/emoji_filter.rb | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/banzai/filter/emoji_filter.rb b/lib/banzai/filter/emoji_filter.rb index e1261e7bbbe..4eccd9d5ed5 100644 --- a/lib/banzai/filter/emoji_filter.rb +++ b/lib/banzai/filter/emoji_filter.rb @@ -3,10 +3,6 @@ module Banzai # HTML filter that replaces :emoji: and unicode with images. # # Based on HTML::Pipeline::EmojiFilter - # - # Context options: - # :asset_root - # :asset_host class EmojiFilter < HTML::Pipeline::Filter IGNORED_ANCESTOR_TAGS = %w(pre code tt).to_set |