diff options
author | Marcel Amirault <mamirault@gitlab.com> | 2022-06-23 10:17:16 +0300 |
---|---|---|
committer | Marcel Amirault <mamirault@gitlab.com> | 2022-06-23 10:17:16 +0300 |
commit | 23fb4eac02cd38fd19423464638f5f1771d536a3 (patch) | |
tree | 9f1d11a5f9bd0d0c11cb5de147654d8789dc9f15 | |
parent | addd6825356dd2f21642fd9f1b97fe4c8d923c8c (diff) | |
parent | 97f5321ae89af9948acbc09f739e7c9b1e6045ae (diff) |
Merge branch 'eread/downgrade-gitlab-kramdown' into 'main'
Move back to a gitlab_kramdown version that doesn't require Ruby 2.7.6
See merge request gitlab-org/gitlab-docs!2853
-rw-r--r-- | Gemfile | 2 | ||||
-rw-r--r-- | Gemfile.lock | 24 |
2 files changed, 13 insertions, 13 deletions
@@ -10,7 +10,7 @@ group :nanoc do gem 'nanoc-live' # custom kramdown dialect - gem 'gitlab_kramdown', '~> 0.20.0' + gem 'gitlab_kramdown', '~> 0.19.0' # Needed to generate Sitemap gem 'builder', '~> 3.2.0' diff --git a/Gemfile.lock b/Gemfile.lock index 7c387dd7..8bbbed48 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -17,8 +17,8 @@ GEM listen (~> 3.0) rack-livereload (~> 0.3) asciidoctor (2.0.17) - asciidoctor-plantuml (0.0.16) - asciidoctor (>= 2.0.17, < 3.0.0) + asciidoctor-plantuml (0.0.15) + asciidoctor (>= 1.5.6, < 3.0.0) ast (2.4.2) builder (3.2.4) byebug (11.1.3) @@ -88,7 +88,7 @@ GEM gitlab (4.18.0) httparty (~> 0.18) terminal-table (>= 1.5.1) - gitlab-dangerfiles (3.4.0) + gitlab-dangerfiles (3.4.1) danger (>= 8.4.5) danger-gitlab (>= 8.0.0) rake @@ -99,11 +99,11 @@ GEM rubocop-performance (~> 1.9.2) rubocop-rails (~> 2.9) rubocop-rspec (~> 1.44) - gitlab_kramdown (0.20.0) - asciidoctor-plantuml (= 0.0.16) - kramdown (~> 2.4.0) + gitlab_kramdown (0.19.0) + asciidoctor-plantuml (= 0.0.15) + kramdown (~> 2.3.0) nokogiri (~> 1.13.0) - rouge (~> 3.29.0) + rouge (~> 3.28.0) hamster (3.0.0) concurrent-ruby (~> 1.0) highline (2.0.3) @@ -114,7 +114,7 @@ GEM i18n (1.10.0) concurrent-ruby (~> 1.0) json_schema (0.21.0) - kramdown (2.4.0) + kramdown (2.3.2) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) @@ -127,7 +127,7 @@ GEM mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) mini_portile2 (2.8.0) - minitest (5.15.0) + minitest (5.16.1) multi_xml (0.6.0) multipart-post (2.2.3) nanoc (4.12.7) @@ -203,7 +203,7 @@ GEM rchardet (1.8.0) regexp_parser (2.5.0) rexml (3.2.5) - rouge (3.29.0) + rouge (3.28.0) rspec (3.11.0) rspec-core (~> 3.11.0) rspec-expectations (~> 3.11.0) @@ -266,7 +266,7 @@ GEM tzinfo (2.0.4) concurrent-ruby (~> 1.0) unicode-display_width (1.8.0) - zeitwerk (2.5.4) + zeitwerk (2.6.0) PLATFORMS ruby @@ -275,7 +275,7 @@ DEPENDENCIES builder (~> 3.2.0) gitlab-dangerfiles (~> 3.4.0) gitlab-styles (~> 7.1.0) - gitlab_kramdown (~> 0.20.0) + gitlab_kramdown (~> 0.19.0) highline (~> 2.0.0) nanoc (~> 4.12.0) nanoc-live |