diff --git a/debian/patches/0396-relax-asciidoctor-plantuml.patch b/debian/patches/0396-relax-asciidoctor-plantuml.patch new file mode 100644 index 0000000000..b1978bbba8 --- /dev/null +++ b/debian/patches/0396-relax-asciidoctor-plantuml.patch @@ -0,0 +1,13 @@ +https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18643 + +--- a/Gemfile ++++ b/Gemfile +@@ -134,7 +134,7 @@ + gem 'creole', '~> 0.5.0' + gem 'wikicloth', '0.8.1' + gem 'asciidoctor', '~> 1.5', '>= 1.5.2' +-gem 'asciidoctor-plantuml', '0.0.7' ++gem 'asciidoctor-plantuml', '~> 0.0.7' + gem 'rouge', '~> 2.0' + gem 'truncato', '~> 0.7.9' + gem 'bootstrap_form', '~> 2.7' diff --git a/debian/patches/series b/debian/patches/series index 676974a040..246a380d2e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -22,6 +22,7 @@ pid-log-paths.patch 0393-relax-kubeclient.patch 0394-relax-grpc.patch 0395-relax-grape-entity.patch +0396-relax-asciidoctor-plantuml.patch 0410-set-webpack-root.patch 0415-remove-dev-dependencies.patch add-system-lib-path-for-webpack.patch