diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 12:09:46 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-02-16 12:09:46 +0300 |
| commit | 27b71e800dfe4de3f692c700190b0026e012dc8c (patch) | |
| tree | 9c4773a3cf83b75b7cf10c52ed595b9de7674ceb /lib | |
| parent | 06004734e1a30ef9b70861fdad522f7e2b70f6d8 (diff) | |
| parent | e090366f78add95ecda4032f2043b6037d082a01 (diff) | |
Merge branch 'dm-escape-commit-message' into 'master'
Escape HTML entities in commit messages
Closes #42833
See merge request gitlab-org/gitlab-ce!17144
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 f3bd587c28b..e008fd428b0 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_once(text) + ERB::Util.html_escape(text) end end end |