summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakuya Noguchi <takninnovationresearch@gmail.com>2018-11-14 17:35:56 +0900
committerTakuya Noguchi <takninnovationresearch@gmail.com>2018-11-15 00:33:48 +0900
commit4166ce773ba4445acb9dcf38eacd69ac10a8d30c (patch)
tree47d5cdcf4e166740fb9218955606a4417963fe9b
parent24e5599748d98f34dc4f534eebc79a1bd9f0ddf9 (diff)
downloadgitlab-ce-4166ce773ba4445acb9dcf38eacd69ac10a8d30c.tar.gz
Update asciidoctor to 1.5.8
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
-rw-r--r--Gemfile.rails4.lock4
-rw-r--r--changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml5
4 files changed, 10 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 7030bd9c5e8..2d7a1066a5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -133,7 +133,7 @@ gem 'rdoc', '~> 6.0'
gem 'org-ruby', '~> 0.9.12'
gem 'creole', '~> 0.5.0'
gem 'wikicloth', '0.8.1'
-gem 'asciidoctor', '~> 1.5.6'
+gem 'asciidoctor', '~> 1.5.8'
gem 'asciidoctor-plantuml', '0.0.8'
gem 'rouge', '~> 3.1'
gem 'truncato', '~> 0.7.9'
diff --git a/Gemfile.lock b/Gemfile.lock
index f08855ed049..b0afed9e067 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,7 +58,7 @@ GEM
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
- asciidoctor (1.5.6.2)
+ asciidoctor (1.5.8)
asciidoctor-plantuml (0.0.8)
asciidoctor (~> 1.5)
ast (2.4.0)
@@ -942,7 +942,7 @@ DEPENDENCIES
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.6.0)
- asciidoctor (~> 1.5.6)
+ asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
awesome_print
diff --git a/Gemfile.rails4.lock b/Gemfile.rails4.lock
index 5bec40de909..a9506010cc5 100644
--- a/Gemfile.rails4.lock
+++ b/Gemfile.rails4.lock
@@ -55,7 +55,7 @@ GEM
faraday_middleware (~> 0.9)
faraday_middleware-multi_json (~> 0.0)
oauth2 (~> 1.0)
- asciidoctor (1.5.6.2)
+ asciidoctor (1.5.8)
asciidoctor-plantuml (0.0.8)
asciidoctor (~> 1.5)
ast (2.4.0)
@@ -933,7 +933,7 @@ DEPENDENCIES
addressable (~> 2.5.2)
akismet (~> 2.0)
asana (~> 0.6.0)
- asciidoctor (~> 1.5.6)
+ asciidoctor (~> 1.5.8)
asciidoctor-plantuml (= 0.0.8)
attr_encrypted (~> 3.1.0)
awesome_print
diff --git a/changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml b/changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml
new file mode 100644
index 00000000000..f0b0aa0ee1c
--- /dev/null
+++ b/changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml
@@ -0,0 +1,5 @@
+---
+title: Update asciidoctor to 1.5.8
+merge_request: 23047
+author: Takuya Noguchi
+type: other