diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-28 08:17:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-28 08:17:43 +0000 |
| commit | 63923301be7dbf30aa77f32c32cdb00b58f02673 (patch) | |
| tree | f2796029497324e9d34289f9ce9e770b31a2c151 /Gemfile.lock | |
| parent | 51d92fb568f9064f35c668e7f6abbbf0f8ad00bd (diff) | |
| parent | a03105f89b20ea5f9872b182727d597febbf3068 (diff) | |
| download | gitlab-ce-63923301be7dbf30aa77f32c32cdb00b58f02673.tar.gz | |
Merge branch '44712-update-asciidoctor-from-1.5.3-to-1.5.6.2' into 'master'
Update asciidoctor to 1.5.6.2 and asciidoctor-plantuml to 0.0.8
Closes #44712
See merge request gitlab-org/gitlab-ce!18022
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index d50b3b1857a..7d8b22359b2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,8 +56,8 @@ GEM faraday_middleware (~> 0.9) faraday_middleware-multi_json (~> 0.0) oauth2 (~> 1.0) - asciidoctor (1.5.3) - asciidoctor-plantuml (0.0.7) + asciidoctor (1.5.6.2) + asciidoctor-plantuml (0.0.8) asciidoctor (~> 1.5) asset_sync (2.2.0) activemodel (>= 4.1.0) @@ -999,8 +999,8 @@ DEPENDENCIES akismet (~> 2.0) allocations (~> 1.0) asana (~> 0.6.0) - asciidoctor (~> 1.5.2) - asciidoctor-plantuml (= 0.0.7) + asciidoctor (~> 1.5.6) + asciidoctor-plantuml (= 0.0.8) asset_sync (~> 2.2.0) attr_encrypted (~> 3.0.0) awesome_print (~> 1.2.0) |