From f44f70e405c6c56e759f80ece1e53bece81d946d Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Mon, 4 Dec 2023 17:30:57 +0000 Subject: [PATCH] Update puma gem --- Gemfile | 4 ++-- Gemfile.lock | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index dd8c83ae..1819f9eb 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ gem 'devise_invitable' gem 'haml-rails' gem 'high_voltage' gem 'pg' -gem 'puma' +gem 'puma', '< 5' gem 'pundit' gem 'simple_form' gem 'dotenv-rails' @@ -33,7 +33,7 @@ group :development do gem 'capistrano-bundler' gem 'capistrano-rails' gem 'capistrano-rails-console' - gem 'capistrano3-puma', '~> 3' + gem 'capistrano3-puma', '~> 5' gem 'capistrano-rbenv' gem 'capistrano-nginx', github: 'koenpunt/capistrano-nginx' gem "capistrano-db-tasks", require: false diff --git a/Gemfile.lock b/Gemfile.lock index a738b596..8378aa18 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,10 +129,10 @@ GEM capistrano3-delayed-job (1.7.6) capistrano (~> 3.0, >= 3.0.0) daemons (~> 1.3) - capistrano3-puma (3.1.1) + capistrano3-puma (5.2.0) capistrano (~> 3.7) capistrano-bundler - puma (~> 3.4) + puma (>= 4.0, < 6.0) capybara (3.39.2) addressable matrix @@ -376,7 +376,8 @@ GEM psych (5.1.1.1) stringio public_suffix (5.0.4) - puma (3.12.6) + puma (4.3.12) + nio4r (~> 2.0) pundit (2.3.1) activesupport (>= 3.0.0) racc (1.7.3) @@ -584,7 +585,7 @@ DEPENDENCIES capistrano-rails-console capistrano-rbenv capistrano3-delayed-job (~> 1.0) - capistrano3-puma (~> 3) + capistrano3-puma (~> 5) capybara capybara-screenshot ci_reporter_rspec @@ -619,7 +620,7 @@ DEPENDENCIES pg pry-rails pry-rescue - puma + puma (< 5) pundit rack-livereload rails (~> 7.0)