diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-19 13:56:08 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-19 13:56:08 +0000 |
| commit | cc46a0d47c5660583455c203a93f3333af42f4a8 (patch) | |
| tree | deef0c7ac7a1bd2468a576556c7971a8abc3e7d4 /lib | |
| parent | 12f649fe2a83dd637aeb700fc98cdcfcd9ac2100 (diff) | |
| parent | 9c8c5e9dc050f32cec05f6903105ff34d726979b (diff) | |
| download | gitlab-ce-cc46a0d47c5660583455c203a93f3333af42f4a8.tar.gz | |
Merge branch 'fix-escaping' into 'master'
fix: commit messages being double-escaped in activities tab
See merge request !6937
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/banzai/filter/html_entity_filter.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/filter/html_entity_filter.rb b/lib/banzai/filter/html_entity_filter.rb index e008fd428b0..f3bd587c28b 100644 --- a/lib/banzai/filter/html_entity_filter.rb +++ b/lib/banzai/filter/html_entity_filter.rb @@ -5,7 +5,7 @@ module Banzai # Text filter that escapes these HTML entities: & " < > class HtmlEntityFilter < HTML::Pipeline::TextFilter def call - ERB::Util.html_escape(text) + ERB::Util.html_escape_once(text) end end end |