diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-10-10 20:33:58 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-10-10 20:33:58 +0300 |
| commit | 494269fc92f61098ee6bd635a0426129ce2c5456 (patch) | |
| tree | 556055ac9d3bb5727880855e1242e5ad39ffd90c /lib | |
| parent | d035f783ca40ab34c6bca149fb29a77fd80af832 (diff) | |
| parent | aac2af5bc42fbca355d7d5f5ab03ef662b876219 (diff) | |
Merge branch 'fix-misnamed-constant' into 'master'
Rename HTMLEntityFilter to HtmlEntityFilter to fix autoloading
See merge request !6776
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/html_entity_filter.rb | 2 | ||||
| -rw-r--r-- | lib/banzai/pipeline/single_line_pipeline.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/banzai/filter/html_entity_filter.rb b/lib/banzai/filter/html_entity_filter.rb index 4ef8b3b6dcf..e008fd428b0 100644 --- a/lib/banzai/filter/html_entity_filter.rb +++ b/lib/banzai/filter/html_entity_filter.rb @@ -3,7 +3,7 @@ require 'erb' module Banzai module Filter # Text filter that escapes these HTML entities: & " < > - class HTMLEntityFilter < HTML::Pipeline::TextFilter + class HtmlEntityFilter < HTML::Pipeline::TextFilter def call ERB::Util.html_escape(text) end diff --git a/lib/banzai/pipeline/single_line_pipeline.rb b/lib/banzai/pipeline/single_line_pipeline.rb index 30bc035d085..1929099931b 100644 --- a/lib/banzai/pipeline/single_line_pipeline.rb +++ b/lib/banzai/pipeline/single_line_pipeline.rb @@ -3,7 +3,7 @@ module Banzai class SingleLinePipeline < GfmPipeline def self.filters @filters ||= FilterArray[ - Filter::HTMLEntityFilter, + Filter::HtmlEntityFilter, Filter::SanitizationFilter, Filter::EmojiFilter, |