diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-19 07:42:51 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-19 07:42:51 +0000 |
| commit | d892df9adc1af37590dab0146ef0f008c9628339 (patch) | |
| tree | 971101c28413aca28a1c448a6bc1e4d91faacd5a | |
| parent | 834bd36c624b50b0aac3e1b33aae558b598338d7 (diff) | |
| parent | 4166ce773ba4445acb9dcf38eacd69ac10a8d30c (diff) | |
| download | gitlab-ce-d892df9adc1af37590dab0146ef0f008c9628339.tar.gz | |
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
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | Gemfile.rails4.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/54010-update-asciidoctor-to-1-5-8.yml | 5 |
4 files changed, 10 insertions, 5 deletions
@@ -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 e21a1b85457..4281870c711 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 fea3102b8d6..428ffafce98 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 |