diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-04-21 10:17:19 -0500 |
|---|---|---|
| committer | Toon Claes <toon@gitlab.com> | 2017-04-27 13:22:17 +0200 |
| commit | 4f2d6b3e21911ab29ae18dff1be909d94f3127ed (patch) | |
| tree | ea7186401f4b0fa02970c55f788b1dabeb2a247a /lib | |
| parent | 05e0f504530a162d4bcb886adf504c12cffd5934 (diff) | |
| download | gitlab-ce-4f2d6b3e21911ab29ae18dff1be909d94f3127ed.tar.gz | |
Refactor MarkupHelper
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/asciidoc.rb | 8 | ||||
| -rw-r--r-- | lib/gitlab/other_markup.rb | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb index b157b59f9dd..6a671ab2630 100644 --- a/lib/gitlab/asciidoc.rb +++ b/lib/gitlab/asciidoc.rb @@ -14,15 +14,9 @@ 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 = {}) + def self.render(input, asciidoc_opts = {}) asciidoc_opts.reverse_merge!( safe: :secure, backend: :gitlab_html5, diff --git a/lib/gitlab/other_markup.rb b/lib/gitlab/other_markup.rb index 214dba0fa11..c2adc9aa10b 100644 --- a/lib/gitlab/other_markup.rb +++ b/lib/gitlab/other_markup.rb @@ -4,14 +4,8 @@ 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) |