2 commits

Author	SHA1	Message	Date
Cindy Pallares	c4bb0a116e	Merge branch 'security-mermaid-xss' into 'master' ... [master] Fix XSS in mermaid diagrams See merge request gitlab/gitlabhq!2597	2018-11-28 19:09:28 -05:00
Douwe Maan	603fa7c141	Merge branch 'fix-mermaid-xss' into 'security-10-4' ... [10.4] Fix stored XSS in code blocks	2018-02-09 12:13:44 -06:00