From bbb8ff2583106204adde250eab91bc1a1ec5139c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 19 Mar 2025 14:09:02 +0000 Subject: [PATCH 1/2] Bump middleman from 4.5.1 to 4.6.0 Bumps [middleman](https://github.com/middleman/middleman) from 4.5.1 to 4.6.0. - [Changelog](https://github.com/middleman/middleman/blob/main/CHANGELOG.md) - [Commits](https://github.com/middleman/middleman/compare/v4.5.1...v4.6.0) --- updated-dependencies: - dependency-name: middleman dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Gemfile.lock | 107 +++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 45 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 569bb9494c4..31062bce403 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,79 +1,92 @@ GEM remote: https://rubygems.org/ specs: - activesupport (7.0.8) - concurrent-ruby (~> 1.0, >= 1.0.2) + activesupport (8.0.2) + base64 + benchmark (>= 0.3) + bigdecimal + concurrent-ruby (~> 1.0, >= 1.3.1) + connection_pool (>= 2.2.5) + drb i18n (>= 1.6, < 2) + logger (>= 1.4.2) minitest (>= 5.1) - tzinfo (~> 2.0) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + uri (>= 0.13.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) autoprefixer-rails (10.3.1.0) execjs (~> 2) - backports (3.24.1) + base64 (0.2.0) + benchmark (0.4.0) + bigdecimal (3.1.9) borrower (0.10.0) coffee-script (2.4.1) coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.2.3) - contracts (0.16.1) - dotenv (2.8.1) - erubis (2.7.0) - execjs (2.9.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) + contracts (0.17.2) + dotenv (3.1.7) + drb (2.2.1) + erubi (1.13.1) + execjs (2.10.0) fast_blank (1.0.1) - fastimage (2.3.0) - ffi (1.16.3) + fastimage (2.4.0) + ffi (1.17.1) haml (6.3.0) temple (>= 0.8.2) thor tilt hamster (3.0.0) concurrent-ruby (~> 1.0) - hashie (3.6.0) - i18n (1.6.0) + hashie (5.0.0) + i18n (1.14.7) concurrent-ruby (~> 1.0) - kramdown (2.4.0) - rexml - listen (3.8.0) + kramdown (2.5.1) + rexml (>= 3.3.9) + listen (3.9.0) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) + logger (1.6.6) memoist (0.16.2) - middleman (4.5.1) - coffee-script (~> 2.2) - haml (>= 4.0.5) - kramdown (>= 2.3.0) - middleman-cli (= 4.5.1) - middleman-core (= 4.5.1) + middleman (4.6.0) + middleman-cli (= 4.6.0) + middleman-core (= 4.6.0) middleman-autoprefixer (3.0.0) autoprefixer-rails (~> 10.0) middleman-core (>= 4.0.0) - middleman-cli (4.5.1) + middleman-cli (4.6.0) thor (>= 0.17.0, < 1.3.0) - middleman-core (4.5.1) - activesupport (>= 6.1, < 7.1) + middleman-core (4.6.0) + activesupport (>= 6.1) addressable (~> 2.4) - backports (~> 3.6) bundler (~> 2.0) - contracts (~> 0.13, < 0.17) + coffee-script (~> 2.2) + contracts dotenv - erubis + erubi execjs (~> 2.0) fast_blank fastimage (~> 2.0) + haml (>= 4.0.5) hamster (~> 3.0) - hashie (~> 3.4) - i18n (~> 1.6.0) + hashie (>= 3.4, < 6.0) + i18n (>= 1.6, < 1.15) + kramdown (~> 2.4) listen (~> 3.0) memoist (~> 0.14) padrino-helpers (~> 0.15.0) parallel - rack (>= 1.4.5, < 3) + rack (>= 3) + rackup sassc (~> 2.0) servolux - tilt (~> 2.0.9) + tilt (~> 2.2) toml - uglifier (~> 3.0) + uglifier (>= 3, < 5) webrick middleman-data_source (0.8.1) borrower (~> 0.9) @@ -86,7 +99,7 @@ GEM middleman-core (>= 3.2) rouge (~> 3.2) mini_portile2 (2.8.8) - minitest (5.21.2) + minitest (5.25.5) nokogiri (1.18.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) @@ -95,18 +108,20 @@ GEM padrino-support (= 0.15.3) tilt (>= 1.4.1, < 3) padrino-support (0.15.3) - parallel (1.24.0) + parallel (1.26.3) parslet (2.0.0) - public_suffix (5.0.4) + public_suffix (6.0.1) racc (1.8.1) - rack (2.2.8) + rack (3.1.12) rack-test (0.6.3) rack (>= 1.0) + rackup (2.2.1) + rack (>= 3) rb-fsevent (0.11.2) - rb-inotify (0.10.1) + rb-inotify (0.11.1) ffi (~> 1.0) redcarpet (3.6.1) - rexml (3.2.6) + rexml (3.4.1) rouge (3.30.0) sass (3.7.4) sass-listen (~> 4.0.0) @@ -115,19 +130,21 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) sassc (2.4.0) ffi (~> 1.9) + securerandom (0.4.1) servolux (0.13.0) - sprockets (3.7.2) + sprockets (4.2.1) concurrent-ruby (~> 1.0) - rack (> 1, < 3) + rack (>= 2.2.4, < 4) temple (0.10.3) thor (1.2.2) - tilt (2.0.11) + tilt (2.6.0) toml (0.3.0) parslet (>= 1.8.0, < 3.0.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - uglifier (3.2.0) + uglifier (4.2.1) execjs (>= 0.3.0, < 3) + uri (1.0.3) webrick (1.9.1) PLATFORMS From ffac146e4c39c6ed2c014fddf3c7914d593e2e37 Mon Sep 17 00:00:00 2001 From: Grey Moore Date: Wed, 19 Mar 2025 10:13:42 -0400 Subject: [PATCH 2/2] pin activesupport --- Gemfile | 3 +++ Gemfile.lock | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 5a813cb095f..5d22833362b 100644 --- a/Gemfile +++ b/Gemfile @@ -12,3 +12,6 @@ gem 'redcarpet', '~> 3.6.0' gem 'nokogiri', '~> 1.18.1' gem 'sass' gem 'webrick' + +# Prevent activesupport from updating to v8, because that's incompatible with ruby 3.1 +gem 'activesupport', '< 8.0' diff --git a/Gemfile.lock b/Gemfile.lock index 31062bce403..c29129ff454 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: https://rubygems.org/ specs: - activesupport (8.0.2) + activesupport (7.2.2.1) base64 benchmark (>= 0.3) bigdecimal @@ -13,7 +13,6 @@ GEM minitest (>= 5.1) securerandom (>= 0.3) tzinfo (~> 2.0, >= 2.0.5) - uri (>= 0.13.1) addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) autoprefixer-rails (10.3.1.0) @@ -144,13 +143,13 @@ GEM concurrent-ruby (~> 1.0) uglifier (4.2.1) execjs (>= 0.3.0, < 3) - uri (1.0.3) webrick (1.9.1) PLATFORMS ruby DEPENDENCIES + activesupport (< 8.0) middleman (~> 4.4) middleman-autoprefixer (~> 3.0) middleman-data_source