Commit Graph

6 Commits

Author SHA1 Message Date
GitLab Bot 3900b8a006 Add latest changes from gitlab-org/gitlab@master 2019-10-07 06:06:10 +00:00
Rajat Jain e5fdd91318
Only render fixed number of mermaid blocks 2019-09-30 14:22:04 +02:00
Thong Kuah 73e848850c Add frozen_string_literal to spec/features
Using the sed script from
https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
2019-07-26 13:23:30 +12:00
Martin Hanzel d50f41d0f2 Fix linebreak rendering in Mermaid flowcharts 2019-07-16 07:09:55 +00:00
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