Merge branch 'trunk' into pivotal_188310215

ideacrew · Sep 24, 2024 · 3727033 · 3727033
2 parents c7a82c4 + 90cc9ae
commit 3727033
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -36,7 +36,7 @@ gem 'rexml', '>= 3.3.6'
 gem 'pg'
 
 # Use Puma as the app server
-gem 'puma', '~> 6.4.2'
+gem 'puma', '~> 6.4.3'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails', branch: 'main'
 gem 'rails', '~> 7.0.8.3'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -386,7 +386,7 @@ GEM
       byebug (~> 11.0)
       pry (>= 0.13, < 0.15)
     public_suffix (5.0.4)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.7.3)
     rack (2.2.8.1)
@@ -565,7 +565,7 @@ DEPENDENCIES
   pg
   prettier
   pry-byebug
-  puma (~> 6.4.2)
+  puma (~> 6.4.3)
   rails (~> 7.0.8.3)
   rbnacl
   redcarpet