summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-06-18 10:03:13 +0000
committerDouwe Maan <douwe@gitlab.com>2019-06-18 10:03:13 +0000
commitc167cc58d3efe2bf1d8f9ccb1a58d7819fef1901 (patch)
tree306264d047406840bd6f0a6561d2c47a9931eda8 /Gemfile
parent28fe2a67d00938ac504fb1838ed4c42931880c2e (diff)
parentaebee1882d25498bfcb97472c8ace69cc691aeca (diff)
downloadgitlab-ce-c167cc58d3efe2bf1d8f9ccb1a58d7819fef1901.tar.gz
Merge branch 'asciidoctor-upgrade' into 'master'
Upgrade asciidoctor version to 2.0.10 and change method names in html5_converter Closes #63304 See merge request gitlab-org/gitlab-ce!29741
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c9a95fb7a36..b9ce2422153 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'