Skip to content

Commit d892df9

Browse files
committed
Merge branch '54010-update-asciidoctor-to-1.5.8' into 'master'
Update asciidoctor to 1.5.8 Closes #54010 See merge request gitlab-org/gitlab-ce!23047
2 parents 834bd36 + 4166ce7 commit d892df9

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ gem 'rdoc', '~> 6.0'
133133
gem 'org-ruby', '~> 0.9.12'
134134
gem 'creole', '~> 0.5.0'
135135
gem 'wikicloth', '0.8.1'
136-
gem 'asciidoctor', '~> 1.5.6'
136+
gem 'asciidoctor', '~> 1.5.8'
137137
gem 'asciidoctor-plantuml', '0.0.8'
138138
gem 'rouge', '~> 3.1'
139139
gem 'truncato', '~> 0.7.9'

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ GEM
5858
faraday_middleware (~> 0.9)
5959
faraday_middleware-multi_json (~> 0.0)
6060
oauth2 (~> 1.0)
61-
asciidoctor (1.5.6.2)
61+
asciidoctor (1.5.8)
6262
asciidoctor-plantuml (0.0.8)
6363
asciidoctor (~> 1.5)
6464
ast (2.4.0)
@@ -942,7 +942,7 @@ DEPENDENCIES
942942
addressable (~> 2.5.2)
943943
akismet (~> 2.0)
944944
asana (~> 0.6.0)
945-
asciidoctor (~> 1.5.6)
945+
asciidoctor (~> 1.5.8)
946946
asciidoctor-plantuml (= 0.0.8)
947947
attr_encrypted (~> 3.1.0)
948948
awesome_print

Gemfile.rails4.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ GEM
5555
faraday_middleware (~> 0.9)
5656
faraday_middleware-multi_json (~> 0.0)
5757
oauth2 (~> 1.0)
58-
asciidoctor (1.5.6.2)
58+
asciidoctor (1.5.8)
5959
asciidoctor-plantuml (0.0.8)
6060
asciidoctor (~> 1.5)
6161
ast (2.4.0)
@@ -933,7 +933,7 @@ DEPENDENCIES
933933
addressable (~> 2.5.2)
934934
akismet (~> 2.0)
935935
asana (~> 0.6.0)
936-
asciidoctor (~> 1.5.6)
936+
asciidoctor (~> 1.5.8)
937937
asciidoctor-plantuml (= 0.0.8)
938938
attr_encrypted (~> 3.1.0)
939939
awesome_print
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
title: Update asciidoctor to 1.5.8
3+
merge_request: 23047
4+
author: Takuya Noguchi
5+
type: other

0 commit comments

Comments
 (0)