From 217a17e39561a22a251a62d7a3f7635737022ed3 Mon Sep 17 00:00:00 2001
From: Dombi Attila <83396+dombesz@users.noreply.github.com>
Date: Mon, 25 Nov 2024 10:44:04 +0200
Subject: [PATCH] Use the released gem version of puma instead of the git repo.

---
 Gemfile      |  5 +----
 Gemfile.lock | 12 +++---------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/Gemfile b/Gemfile
index cbc35414756..582fc47827c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -184,10 +184,7 @@ gem "rails-i18n", "~> 7.0.0"
 gem "sprockets", "~> 3.7.2" # lock sprockets below 4.0
 gem "sprockets-rails", "~> 3.5.1"
 
-# waiting for a release of puma to fix an issue with current rackup update
-# see https://github.com/puma/puma/pull/3532
-# gem "puma", "~> 6.4"
-gem "puma", github: "puma/puma", branch: "master"
+gem "puma", "~> 6.5"
 gem "puma-plugin-statsd", "~> 2.0"
 gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base"
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c0ac0aae45..87a9d8300be 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -58,14 +58,6 @@ GIT
       parallel_tests (>= 3.3.0, < 5)
       rspec (>= 3.10)
 
-GIT
-  remote: https://github.com/puma/puma.git
-  revision: 6a87b708a0862e559ab549259bd54bc13c090734
-  branch: master
-  specs:
-    puma (6.5.0)
-      nio4r (~> 2.0)
-
 PATH
   remote: modules/auth_plugins
   specs:
@@ -887,6 +879,8 @@ GEM
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
+    puma (6.5.0)
+      nio4r (~> 2.0)
     puma-plugin-statsd (2.6.0)
       puma (>= 5.0, < 7)
     raabro (1.4.0)
@@ -1340,7 +1334,7 @@ DEPENDENCIES
   pry-rails (~> 0.3.6)
   pry-rescue (~> 1.6.0)
   puffing-billy (~> 4.0.0)
-  puma!
+  puma (~> 6.5)
   puma-plugin-statsd (~> 2.0)
   rack-attack (~> 6.7.0)
   rack-cors (~> 2.0.2)