diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 21:20:41 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-05-02 21:20:41 +0300 |
| commit | bbfbcebdf69261bac6aa142f430719955e8e86b9 (patch) | |
| tree | 25916a1a761cb6c8fcdac4b20b76017a7f4506d3 /lib/gitlab/other_markup.rb | |
| parent | 3b82444eb7791e58e3e0ba2f08b8ccde48e3d4c6 (diff) | |
| parent | 920d55b9f8afd35e16351fb57d671acf66092e89 (diff) | |
Merge branch 'master' into 28433-internationalise-cycle-analytics-page
Diffstat (limited to 'lib/gitlab/other_markup.rb')
| -rw-r--r-- | lib/gitlab/other_markup.rb | 10 |
1 files changed, 1 insertions, 9 deletions
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 |