diff --git a/.ruby-version b/.ruby-version index 818bd47abfc912..2451c27caf75bb 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.6 +3.0.7 diff --git a/Gemfile b/Gemfile index f5b43934a9525d..54b973276405be 100644 --- a/Gemfile +++ b/Gemfile @@ -65,7 +65,6 @@ gem 'nsa', '~> 0.2' gem 'oj', '~> 3.13' gem 'ox', '~> 2.14' gem 'parslet' -gem 'posix-spawn' gem 'public_suffix', '~> 5.0' gem 'pundit', '~> 2.3' gem 'premailer-rails' @@ -159,3 +158,7 @@ gem 'connection_pool', require: false gem 'xorcist', '~> 1.1' gem 'cocoon', '~> 1.2' gem 'mail', '~> 2.8' + +# temp hacks while upstream masto and dependencies update pins +gem 'cbor', '~> 0.5.9.8' +gem 'posix-spawn', github: "https://github.com/rtomayko/posix-spawn/pull/93" diff --git a/Gemfile.lock b/Gemfile.lock index 2ef78da507659a..9c6c28a0946fa2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -7,6 +7,13 @@ GIT hkdf (~> 0.2) jwt (~> 2.0) +GIT + remote: https://github.com/rtomayko/posix-spawn.git + revision: 0fce38ed5458b638eda5f3bb711903424a4366db + branch: refs/pull/93/head + specs: + posix-spawn (0.3.15) + GEM remote: https://rubygems.org/ specs: @@ -163,7 +170,7 @@ GEM xpath (~> 3.2) case_transform (0.2) activesupport - cbor (0.5.9.6) + cbor (0.5.9.8) charlock_holmes (0.7.7) chewy (7.2.4) activesupport (>= 5.2) @@ -473,7 +480,6 @@ GEM pghero (3.1.0) activerecord (>= 6) pkg-config (1.5.1) - posix-spawn (0.3.15) premailer (1.18.0) addressable css_parser (>= 1.12.0) @@ -836,7 +842,7 @@ DEPENDENCIES pg (~> 1.4) pghero pkg-config (~> 1.5) - posix-spawn + posix-spawn! premailer-rails private_address_check (~> 0.5) pry-byebug (~> 3.10)