From ee845e48409a91d7aff99faffa26b379bac39ea0 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Wed, 28 Mar 2018 00:08:03 +0900 Subject: [PATCH 1/2] Update asciidoctor to 1.5.6.2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- spec/lib/gitlab/asciidoc_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 37530641796..a51b4423d60 100644 --- a/Gemfile +++ b/Gemfile @@ -146,7 +146,7 @@ gem 'rdoc', '~> 4.2' gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' -gem 'asciidoctor', '~> 1.5.2' +gem 'asciidoctor', '~> 1.5.6' gem 'asciidoctor-plantuml', '0.0.7' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' diff --git a/Gemfile.lock b/Gemfile.lock index fcffe45acbf..e1e5de87eda 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,7 +56,7 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) + asciidoctor (1.5.6.2) asciidoctor-plantuml (0.0.7) asciidoctor (~> 1.5) asset_sync (2.2.0) @@ -998,7 +998,7 @@ DEPENDENCIES akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) - asciidoctor (~> 1.5.2) + asciidoctor (~> 1.5.6) asciidoctor-plantuml (= 0.0.7) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) diff --git a/spec/lib/gitlab/asciidoc_spec.rb b/spec/lib/gitlab/asciidoc_spec.rb index 2a0e19ae796..e1782cff81a 100644 --- a/spec/lib/gitlab/asciidoc_spec.rb +++ b/spec/lib/gitlab/asciidoc_spec.rb @@ -48,7 +48,7 @@ module Gitlab }, 'images' => { input: 'image:https://localhost.com/image.png[Alt text" onerror="alert(7)]', - output: "\"Alt" + output: "
\n

Alt text\" onerror=\"alert(7)

\n
" }, 'pre' => { input: '```mypre">', From a03105f89b20ea5f9872b182727d597febbf3068 Mon Sep 17 00:00:00 2001 From: Takuya Noguchi Date: Wed, 28 Mar 2018 00:09:43 +0900 Subject: [PATCH 2/2] Update asciidoctor-plantuml to 0.0.8 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- .../44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml diff --git a/Gemfile b/Gemfile index a51b4423d60..4ec4f5f80fe 100644 --- a/Gemfile +++ b/Gemfile @@ -147,7 +147,7 @@ gem 'org-ruby', '~> 0.9.12' gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 1.5.6' -gem 'asciidoctor-plantuml', '0.0.7' +gem 'asciidoctor-plantuml', '0.0.8' gem 'rouge', '~> 2.0' gem 'truncato', '~> 0.7.9' gem 'bootstrap_form', '~> 2.7.0' diff --git a/Gemfile.lock b/Gemfile.lock index e1e5de87eda..6d70b0d9fa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -57,7 +57,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) asciidoctor (1.5.6.2) - asciidoctor-plantuml (0.0.7) + asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) asset_sync (2.2.0) activemodel (>= 4.1.0) @@ -999,7 +999,7 @@ DEPENDENCIES allocations (~> 1.0) asana (~> 0.6.0) asciidoctor (~> 1.5.6) - asciidoctor-plantuml (= 0.0.7) + asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) diff --git a/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml b/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml new file mode 100644 index 00000000000..bdfed89d2ea --- /dev/null +++ b/changelogs/unreleased/44712-update-asciidoctor-from-1-5-3-to-1-5-6-2.yml @@ -0,0 +1,5 @@ +--- +title: Update asciidoctor-plantuml to 0.0.8 +merge_request: 18022 +author: Takuya Noguchi +type: performance