diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-04-27 12:49:18 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-04-27 12:49:18 +0000 |
| commit | 19a3b49f47ef68eec12663945fa9e2163179853d (patch) | |
| tree | d3391bc1341143e1bcabb31c078d1485d779d714 /lib | |
| parent | 86038fa5d5ceea2d7236b99ed0351e7a33922d0b (diff) | |
| parent | c398f40e5fa5d580e66b07862eceb18e783b13cc (diff) | |
| download | gitlab-ce-19a3b49f47ef68eec12663945fa9e2163179853d.tar.gz | |
Merge branch '26585-remove-readme-view-caching' into 'master'
Remove view fragment caching for project READMEs
Closes #26585 and #29594
See merge request !8838
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/asciidoc.rb | 20 | ||||
| -rw-r--r-- | lib/gitlab/other_markup.rb | 10 |
2 files changed, 5 insertions, 25 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index d575367d81a..fba80c7132e 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -14,28 +14,16 @@ module Gitlab # Public: Converts the provided Asciidoc markup into HTML. # # input - the source text in Asciidoc format - # context - a Hash with the template context: - # :commit - # :project - # :project_wiki - # :requested_path - # :ref - # asciidoc_opts - a Hash of options to pass to the Asciidoctor converter # - def self.render(input, context, asciidoc_opts = {}) - asciidoc_opts.reverse_merge!( - safe: :secure, - backend: :gitlab_html5, - attributes: [] - ) - asciidoc_opts[:attributes].unshift(*DEFAULT_ADOC_ATTRS) + def self.render(input) + asciidoc_opts = { safe: :secure, + backend: :gitlab_html5, + attributes: DEFAULT_ADOC_ATTRS } plantuml_setup html = ::Asciidoctor.convert(input, asciidoc_opts) - html = Banzai.post_process(html, context) - filter = Banzai::Filter::SanitizationFilter.new(html) html = filter.call.to_s diff --git a/lib/gitlab/other_markup.rb b/lib/gitlab/other_markup.rb index e67acf28c94..c2adc9aa10b 100644 --- a/lib/gitlab/other_markup.rb +++ b/lib/gitlab/other_markup.rb @@ -4,19 +4,11 @@ module Gitlab # Public: Converts the provided markup into HTML. # # input - the source text in a markup format - # context - a Hash with the template context: - # :commit - # :project - # :project_wiki - # :requested_path - # :ref # - def self.render(file_name, input, context) + def self.render(file_name, input) html = GitHub::Markup.render(file_name, input). force_encoding(input.encoding) - html = Banzai.post_process(html, context) - filter = Banzai::Filter::SanitizationFilter.new(html) html = filter.call.to_s |