94 lines
2.8 KiB
Diff
94 lines
2.8 KiB
Diff
Description: <short summary of the patch>
|
|
Author: Utkarsh Gupta <guptautkarsh2102@gmail.com>
|
|
Origin: https://gitlab.com/gitlab-org/gitlab-foss/commit/c2ef8589e3b010dcf27adb31dea3ffe72d7a3f6d
|
|
Bug-Debian: https://bugs.debian.org/940814
|
|
Last-Update: 2019-09-16
|
|
|
|
--- a/Gemfile
|
|
+++ b/Gemfile
|
|
@@ -140,9 +140,9 @@
|
|
gem 'org-ruby', '~> 0.9.12'
|
|
gem 'creole', '~> 0.5.0'
|
|
gem 'wikicloth', '0.8.1'
|
|
-gem 'asciidoctor', '~> 1.5', '>=1.5.8'
|
|
+gem 'asciidoctor', '~> 2.0', '>=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'
|
|
--- a/Gemfile.lock
|
|
+++ b/Gemfile.lock
|
|
@@ -66,11 +66,11 @@
|
|
faraday_middleware (~> 0.9)
|
|
faraday_middleware-multi_json (~> 0.0)
|
|
oauth2 (~> 1.0)
|
|
- asciidoctor (1.5.8)
|
|
+ asciidoctor (2.0.10)
|
|
asciidoctor-include-ext (0.3.1)
|
|
asciidoctor (>= 1.5.6, < 3.0.0)
|
|
- asciidoctor-plantuml (0.0.8)
|
|
- asciidoctor (~> 1.5)
|
|
+ asciidoctor-plantuml (0.0.9)
|
|
+ asciidoctor (>= 1.5.6, < 3.0.0)
|
|
ast (2.4.0)
|
|
atomic (1.1.99)
|
|
attr_encrypted (3.1.0)
|
|
@@ -1025,9 +1025,9 @@
|
|
akismet (~> 2.0)
|
|
apollo_upload_server (~> 2.0.0.beta3)
|
|
asana (~> 0.8.1)
|
|
- asciidoctor (~> 1.5.8)
|
|
+ asciidoctor (~> 2.0.10)
|
|
asciidoctor-include-ext (~> 0.3.1)
|
|
- asciidoctor-plantuml (= 0.0.8)
|
|
+ asciidoctor-plantuml (= 0.0.9)
|
|
attr_encrypted (~> 3.1.0)
|
|
awesome_print
|
|
babosa (~> 1.0.2)
|
|
--- a/lib/gitlab/asciidoc/html5_converter.rb
|
|
+++ b/lib/gitlab/asciidoc/html5_converter.rb
|
|
@@ -1,22 +1,19 @@
|
|
# frozen_string_literal: true
|
|
|
|
require 'asciidoctor'
|
|
-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>)
|
|
--- /dev/null
|
|
+++ b/Gemfile.rej
|
|
@@ -0,0 +1,14 @@
|
|
+--- Gemfile
|
|
++++ 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'
|