summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorraju249 <rajendrakadam249@gmail.com>2019-06-17 11:29:45 +0530
committerraju249 <rajendrakadam249@gmail.com>2019-06-17 11:29:45 +0530
commitc2ef8589e3b010dcf27adb31dea3ffe72d7a3f6d (patch)
tree26b9b8d8dab5d34a8887a03e0b5061129a534168
parent207cdba1f2583541fd1847947f081aff9eb5cc68 (diff)
downloadgitlab-ce-c2ef8589e3b010dcf27adb31dea3ffe72d7a3f6d.tar.gz
Upgrade asciidoctor version to 2.0.10 and change menthod names in html5_converter
-rw-r--r--Gemfile4
-rw-r--r--lib/gitlab/asciidoc/html5_converter.rb7
2 files changed, 5 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index a5dccd2ef24..e59ec4e85a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -129,9 +129,9 @@ gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.8'
+gem 'asciidoctor', '~> 2.0.10'
gem 'asciidoctor-include-ext', '~> 0.3.1', require: false
-gem 'asciidoctor-plantuml', '0.0.8'
+gem 'asciidoctor-plantuml', '0.0.9'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.11'
gem 'bootstrap_form', '~> 4.2.0'
diff --git a/lib/gitlab/asciidoc/html5_converter.rb b/lib/gitlab/asciidoc/html5_converter.rb
index 2c5c74e4789..f25eeed5169 100644
--- a/lib/gitlab/asciidoc/html5_converter.rb
+++ b/lib/gitlab/asciidoc/html5_converter.rb
@@ -5,18 +5,17 @@ require 'asciidoctor/converter/html5'
module Gitlab
module Asciidoc
- class Html5Converter < Asciidoctor::Converter::Html5Converter
- extend Asciidoctor::Converter::Config
+ class Html5Converter < (Asciidoctor::Converter.for 'html5')
register_for 'gitlab_html5'
- def stem(node)
+ def convert_stem(node)
return super unless node.style.to_sym == :latexmath
%(<pre#{id_attribute(node)} data-math-style="display"><code>#{node.content}</code></pre>)
end
- def inline_quoted(node)
+ def convert_inline_quoted(node)
return super unless node.type.to_sym == :latexmath
%(<code#{id_attribute(node)} data-math-style="inline">#{node.text}</code>)