summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-10-10 17:33:58 +0000
committerRobert Speicher <robert@gitlab.com>2016-10-10 17:33:58 +0000
commit494269fc92f61098ee6bd635a0426129ce2c5456 (patch)
tree556055ac9d3bb5727880855e1242e5ad39ffd90c
parentd035f783ca40ab34c6bca149fb29a77fd80af832 (diff)
parentaac2af5bc42fbca355d7d5f5ab03ef662b876219 (diff)
downloadgitlab-ce-494269fc92f61098ee6bd635a0426129ce2c5456.tar.gz
Merge branch 'fix-misnamed-constant' into 'master'
Rename HTMLEntityFilter to HtmlEntityFilter to fix autoloading See merge request !6776
-rw-r--r--lib/banzai/filter/html_entity_filter.rb2
-rw-r--r--lib/banzai/pipeline/single_line_pipeline.rb2
-rw-r--r--spec/lib/banzai/filter/html_entity_filter_spec.rb2
3 files changed, 3 insertions, 3 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,
diff --git a/spec/lib/banzai/filter/html_entity_filter_spec.rb b/spec/lib/banzai/filter/html_entity_filter_spec.rb
index 6dc4a970071..4c68ce6d6e4 100644
--- a/spec/lib/banzai/filter/html_entity_filter_spec.rb
+++ b/spec/lib/banzai/filter/html_entity_filter_spec.rb
@@ -1,6 +1,6 @@
require 'spec_helper'
-describe Banzai::Filter::HTMLEntityFilter, lib: true do
+describe Banzai::Filter::HtmlEntityFilter, lib: true do
include FilterSpecHelper
let(:unescaped) { 'foo <strike attr="foo">&&&</strike>' }