diff --git a/Gemfile b/Gemfile index d1d841a14..5377cf92b 100644 --- a/Gemfile +++ b/Gemfile @@ -12,7 +12,7 @@ gem "turbo-rails" # Deployment and drivers gem "activerecord-tenanted" gem "bootsnap", require: false -gem "kamal", bc: "kamal", ref: "344e2d79", require: false +gem "kamal", require: false gem "puma", ">= 5.0" gem "solid_cable", ">= 3.0" gem "solid_cache", "~> 1.0" diff --git a/Gemfile.lock b/Gemfile.lock index 692b72a5a..597ae0102 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,23 +4,6 @@ GIT specs: file_repository (1.4.6) -GIT - remote: https://github.com/basecamp/kamal - revision: 344e2d7995e0134aa52f195a984d8d5e24e31d94 - ref: 344e2d79 - specs: - kamal (2.6.1) - activesupport (>= 7.0) - base64 (~> 0.2) - bcrypt_pbkdf (~> 1.0) - concurrent-ruby (~> 1.2) - dotenv (~> 3.1) - ed25519 (~> 1.4) - net-ssh (~> 7.3) - sshkit (>= 1.23.0, < 2.0) - thor (~> 1.3) - zeitwerk (>= 2.6.18, < 3.0) - GIT remote: https://github.com/basecamp/lexxy revision: a1e547dcb52489821270328b900dc74083d97360 @@ -338,6 +321,17 @@ GEM json (2.13.2) jwt (3.1.2) base64 + kamal (2.7.0) + activesupport (>= 7.0) + base64 (~> 0.2) + bcrypt_pbkdf (~> 1.0) + concurrent-ruby (~> 1.2) + dotenv (~> 3.1) + ed25519 (~> 1.4) + net-ssh (~> 7.3) + sshkit (>= 1.23.0, < 2.0) + thor (~> 1.3) + zeitwerk (>= 2.6.18, < 3.0) language_server-protocol (3.17.0.5) launchy (3.1.1) addressable (~> 2.8) @@ -613,7 +607,7 @@ DEPENDENCIES image_processing (~> 1.14) importmap-rails jbuilder - kamal! + kamal letter_opener lexxy! mission_control-jobs