From f08edd6b8d4e448e593f1adf174a907c67472a94 Mon Sep 17 00:00:00 2001 From: Stan Hu <stanhu@gmail.com> Date: Sat, 16 May 2020 07:55:21 -0700 Subject: [PATCH] Update asciidoctor-plantuml gem to v0.0.12 This adds support for the deflate encoding: https://github.com/hsanson/asciidoctor-plantuml/pull/12 Currently this can only be changed by setting the `PLANTUML_ENCODING` environment variable to `deflate`. Relates to https://gitlab.com/gitlab-org/gitlab/-/issues/216587 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- changelogs/unreleased/sh-update-plantutml-gem.yml | 5 +++++ 3 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/sh-update-plantutml-gem.yml diff --git a/Gemfile b/Gemfile index 70a2ef5b4dc23..23350e3a90707 100644 --- a/Gemfile +++ b/Gemfile @@ -148,7 +148,7 @@ gem 'creole', '~> 0.5.0' gem 'wikicloth', '0.8.1' gem 'asciidoctor', '~> 2.0.10' gem 'asciidoctor-include-ext', '~> 0.3.1', require: false -gem 'asciidoctor-plantuml', '0.0.10' +gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'rouge', '~> 3.19.0' gem 'truncato', '~> 0.7.11' gem 'bootstrap_form', '~> 4.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index e5631d860ee5e..ffff576e8b0fa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,7 @@ GEM asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.10) + asciidoctor-plantuml (0.0.12) asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atlassian-jwt (0.2.0) @@ -1162,7 +1162,7 @@ DEPENDENCIES asana (~> 0.9) asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.10) + asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) attr_encrypted (~> 3.1.0) awesome_print diff --git a/changelogs/unreleased/sh-update-plantutml-gem.yml b/changelogs/unreleased/sh-update-plantutml-gem.yml new file mode 100644 index 0000000000000..ee138a974f290 --- /dev/null +++ b/changelogs/unreleased/sh-update-plantutml-gem.yml @@ -0,0 +1,5 @@ +--- +title: Update asciidoctor-plantuml gem to v0.0.12 +merge_request: 32376 +author: +type: other -- GitLab