diff options
| author | Douwe Maan <douwe@gitlab.com> | 2019-06-18 13:03:13 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2019-06-18 13:03:13 +0300 |
| commit | c167cc58d3efe2bf1d8f9ccb1a58d7819fef1901 (patch) | |
| tree | 306264d047406840bd6f0a6561d2c47a9931eda8 /Gemfile.lock | |
| parent | 28fe2a67d00938ac504fb1838ed4c42931880c2e (diff) | |
| parent | aebee1882d25498bfcb97472c8ace69cc691aeca (diff) | |
Merge branch 'asciidoctor-upgrade' into 'master'
Upgrade asciidoctor version to 2.0.10 and change method names in html5_converter
Closes #63304
See merge request gitlab-org/gitlab-ce!29741
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4cebf73f17a..b03bd58eacc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -66,11 +66,11 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.8) + asciidoctor (2.0.10) asciidoctor-include-ext (0.3.1) asciidoctor (>= 1.5.6, < 3.0.0) - asciidoctor-plantuml (0.0.8) - asciidoctor (~> 1.5) + asciidoctor-plantuml (0.0.9) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.0) atomic (1.1.99) attr_encrypted (3.1.0) @@ -1025,9 +1025,9 @@ DEPENDENCIES akismet (~> 2.0) apollo_upload_server (~> 2.0.0.beta3) asana (~> 0.8.1) - asciidoctor (~> 1.5.8) + asciidoctor (~> 2.0.10) asciidoctor-include-ext (~> 0.3.1) - asciidoctor-plantuml (= 0.0.8) + asciidoctor-plantuml (= 0.0.9) attr_encrypted (~> 3.1.0) awesome_print babosa (~> 1.0.2) |