diff --git a/Gemfile b/Gemfile index f3283f49d3eddee8b8857e44e503fe597dd7faa1..fe5c6c1fa92584aced8231b3fc711cbdecc49269 100644 --- a/Gemfile +++ b/Gemfile @@ -163,7 +163,7 @@ gem 'org-ruby', '~> 0.9.12' 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-include-ext', '~> 0.4.0', require: false gem 'asciidoctor-plantuml', '~> 0.0.12' gem 'asciidoctor-kroki', '~> 0.5.0', require: false gem 'rouge', '~> 3.27.0' diff --git a/Gemfile.lock b/Gemfile.lock index c4b952d8216f524a03603d710089ace6b91316af..65c35045d6f23c4dab604e50686fdeb8b803ad77 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -89,7 +89,7 @@ GEM faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.4) asciidoctor (2.0.15) - asciidoctor-include-ext (0.3.1) + asciidoctor-include-ext (0.4.0) asciidoctor (>= 1.5.6, < 3.0.0) asciidoctor-kroki (0.5.0) asciidoctor (~> 2.0) @@ -1418,7 +1418,7 @@ DEPENDENCIES apollo_upload_server (~> 2.1.0) asana (~> 0.10.3) asciidoctor (~> 2.0.10) - asciidoctor-include-ext (~> 0.3.1) + asciidoctor-include-ext (~> 0.4.0) asciidoctor-kroki (~> 0.5.0) asciidoctor-plantuml (~> 0.0.12) atlassian-jwt (~> 0.2.0) diff --git a/lib/gitlab/asciidoc/include_processor.rb b/lib/gitlab/asciidoc/include_processor.rb index 53d1135a2d7526177eb1af3b777ce7cbdf2fc98e..6c4ecc04cdcbebc72ac584be0464e747cfca0e36 100644 --- a/lib/gitlab/asciidoc/include_processor.rb +++ b/lib/gitlab/asciidoc/include_processor.rb @@ -33,7 +33,7 @@ def include_allowed?(target, reader) max_include_depth = doc.attributes.fetch('max-include-depth').to_i return false if max_include_depth < 1 - return false if target_uri?(target) + return false if target_http?(target) return false if included.size >= max_includes true