diff options
author | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-10 16:17:38 +0000 |
---|---|---|
committer | Regis Boudinot <boudinot.regis@yahoo.com> | 2017-05-10 16:17:38 +0000 |
commit | 19535aa57c2f4df478747a15d3cf2a2765b78c8e (patch) | |
tree | 8516d96dcc76e805c3f02ecb7450f10fe3f779ca /lib/gitlab/asciidoc.rb | |
parent | 5e734dfed5d639ccac857f971562562ac539d4ac (diff) | |
parent | 218692aeadcffaa2f8fc5f0cde911adb48222f54 (diff) | |
download | gitlab-ce-19535aa57c2f4df478747a15d3cf2a2765b78c8e.tar.gz |
Merge branch 'bvl-9-2-security-patches' into '9-2-stable'
Security patches -> `9-2-stable`
See merge request !11234
Diffstat (limited to 'lib/gitlab/asciidoc.rb')
-rw-r--r-- | lib/gitlab/asciidoc.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index fba80c7132e..96d38f6daa0 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -15,17 +15,17 @@ module Gitlab # # input - the source text in Asciidoc format # - def self.render(input) + def self.render(input, context) asciidoc_opts = { safe: :secure, backend: :gitlab_html5, attributes: DEFAULT_ADOC_ATTRS } + context[:pipeline] = :markup + plantuml_setup html = ::Asciidoctor.convert(input, asciidoc_opts) - - filter = Banzai::Filter::SanitizationFilter.new(html) - html = filter.call.to_s + html = Banzai.render(html, context) html.html_safe end |