From 5f6945d845337083ac0c7265af25a26dd520dbe5 Mon Sep 17 00:00:00 2001
From: Caitlin <caitlinhenry.ss@gmail.com>
Date: Tue, 24 Sep 2024 11:09:52 -0400
Subject: [PATCH 1/2] bump puma to 6.4.3

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index d9188beaa..aa40dc573 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,7 @@ gem 'net-smtp'
 gem 'net-pop'
 gem 'net-imap'
 
-gem 'puma', '>= 6.4.2'
+gem 'puma', '>= 6.4.3'
 
 # ------------------------------------------------------------------ Deployment
 # Use Capistrano for deployment
diff --git a/Gemfile.lock b/Gemfile.lock
index 321b73d7d..4dce2e67d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -327,7 +327,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (5.0.3)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.0)
     rack (2.2.9)
@@ -582,7 +582,7 @@ DEPENDENCIES
   paper_trail (~> 12.2.0)
   parslet (~> 1.6.0)
   pg
-  puma (>= 6.4.2)
+  puma (>= 6.4.3)
   rack-mini-profiler (~> 2.0)
   rails (~> 7.0.8.4)
   rails-html-sanitizer (~> 1.4.4)

From c293a87e2ffb506116b1576b812e689d073b1036 Mon Sep 17 00:00:00 2001
From: Caitlin <caitlinhenry.ss@gmail.com>
Date: Tue, 24 Sep 2024 11:15:53 -0400
Subject: [PATCH 2/2] changelog

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0b9e19743..8c8947f7d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,7 @@
 [v#.#.#] ([month] [YYYY])
   - Kit Import: Use file name sequencing when a template file with the same name exists
   - Upgraded gems:
-    - rexml
+    - puma, rexml
   - Bugs fixes:
     - [entity]:
       - [future tense verb] [bug fix]