From 528f02b3e35e06ff5aab4dbb62e2491e04a1ddcc Mon Sep 17 00:00:00 2001
From: "Jesse C. Fisher" <jessecfisher@gmail.com>
Date: Mon, 4 Dec 2023 20:50:51 +0000
Subject: [PATCH] Update to puma 6

---
 Gemfile      |  4 ++--
 Gemfile.lock | 15 +++++++--------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index e193c8c8..98f17be0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'devise_invitable'
 gem 'haml-rails'
 gem 'high_voltage'
 gem 'pg'
-gem 'puma', '< 5'
+gem 'puma', '6'
 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', '~> 5'
+  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 5dd59496..e85eb448 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -129,10 +129,9 @@ GEM
     capistrano3-delayed-job (1.7.6)
       capistrano (~> 3.0, >= 3.0.0)
       daemons (~> 1.3)
-    capistrano3-puma (5.2.0)
-      capistrano (~> 3.7)
-      capistrano-bundler
-      puma (>= 4.0, < 6.0)
+    capistrano3-puma (1.2.1)
+      capistrano (~> 3.0)
+      puma (>= 2.6)
     capybara (3.39.2)
       addressable
       matrix
@@ -376,7 +375,7 @@ GEM
     psych (5.1.1.1)
       stringio
     public_suffix (5.0.4)
-    puma (4.3.12)
+    puma (6.0.0)
       nio4r (~> 2.0)
     pundit (2.3.1)
       activesupport (>= 3.0.0)
@@ -441,7 +440,7 @@ GEM
       railties (>= 3.2)
       tilt
     redis (4.8.1)
-    regexp_parser (2.8.2)
+    regexp_parser (2.8.3)
     reline (0.4.1)
       io-console (~> 0.5)
     responders (3.1.1)
@@ -583,7 +582,7 @@ DEPENDENCIES
   capistrano-rails-console
   capistrano-rbenv
   capistrano3-delayed-job (~> 1.0)
-  capistrano3-puma (~> 5)
+  capistrano3-puma
   capybara
   capybara-screenshot
   ci_reporter_rspec
@@ -618,7 +617,7 @@ DEPENDENCIES
   pg
   pry-rails
   pry-rescue
-  puma (< 5)
+  puma (= 6)
   pundit
   rack-livereload
   rails (~> 7.0)