Commit cc46a0d4 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'fix-escaping' into 'master'

fix: commit messages being double-escaped in activities tab

See merge request !6937
parents 12f649fe 9c8c5e9d
......@@ -122,6 +122,7 @@ Please view this file on the master branch, on stable branches it's out of date.
- Cleanup Ci::ApplicationController. !6757 (Takuya Noguchi)
- Fixes padding in all clipboard icons that have .btn class
- Fix a typo in doc/api/labels.md
- Fix double-escaping in activities tab (Alexandre Maia)
- API: all unknown routing will be handled with 404 Not Found
- Add docs for request profiling
- Delete dynamic environments
......
......@@ -5,7 +5,7 @@ module Filter
# 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
......
......@@ -11,4 +11,9 @@
expect(output).to eq(escaped)
end
it 'does not double-escape' do
escaped = ERB::Util.html_escape("Merge branch 'blabla' into 'master'")
expect(filter(escaped)).to eq(escaped)
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment