diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2016-10-19 13:56:08 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-10-20 17:02:58 +0200 |
| commit | 9adc3f4ca3ceee01f6abf6ec6ea29a02d045244c (patch) | |
| tree | 005b2021d2f490651a1f16b439f74b5416a5d1f0 /lib | |
| parent | 38e4d464fbafd02e8db688487502c1b7033b2373 (diff) | |
| download | gitlab-ce-9adc3f4ca3ceee01f6abf6ec6ea29a02d045244c.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 |