From 4fb67d98e6a0be9acdc74adcb7562d5fe2158ce8 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 30 Mar 2022 23:15:27 +0000
Subject: [PATCH] Bump puma from 2.11.2 to 4.3.12

Bumps [puma](https://github.com/puma/puma) from 2.11.2 to 4.3.12.
- [Release notes](https://github.com/puma/puma/releases)
- [Changelog](https://github.com/puma/puma/blob/master/History.md)
- [Commits](https://github.com/puma/puma/compare/v2.11.2...v4.3.12)

---
updated-dependencies:
- dependency-name: puma
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 15 +++++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)
 mode change 100755 => 100644 Gemfile

diff --git a/Gemfile b/Gemfile
old mode 100755
new mode 100644
index ba59712cf..62db01c0b
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem "pry"
 # Needed for a smooth upgrade from Rails 3.2 to Rails 4.0
 # http://edgeguides.rubyonrails.org/upgrading_ruby_on_rails.html
 gem 'protected_attributes'
-gem "puma", "2.11.2"
+gem "puma", "4.3.12"
 gem "pundit"
 gem "rack-cors", :require => false
 gem 'rails', "4.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index e155fbb2c..6418df28d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -132,7 +132,8 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (4.0.7)
+    haml (5.1.2)
+      temple (>= 0.8.0)
       tilt
     heapy (0.1.3)
     hitimes (1.2.2)
@@ -169,6 +170,7 @@ GEM
     multi_json (1.11.2)
     nenv (0.2.0)
     newrelic_rpm (3.13.0.299)
+    nio4r (2.5.8)
     nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     notiffany (0.0.7)
@@ -191,11 +193,11 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    puma (2.11.2)
-      rack (>= 1.1, < 2.0)
+    puma (4.3.12)
+      nio4r (~> 2.0)
     pundit (1.0.1)
       activesupport (>= 3.0.0)
-    rack (1.6.8)
+    rack (1.6.13)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-cors (0.4.0)
@@ -310,6 +312,7 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    temple (0.8.2)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
@@ -358,7 +361,7 @@ DEPENDENCIES
   foreman
   google-analytics-rails (= 1.1.1)
   guard-rspec
-  haml
+  haml (= 5.1.2)
   http_accept_language
   jbuilder
   jquery-rails
@@ -373,7 +376,7 @@ DEPENDENCIES
   poltergeist
   protected_attributes
   pry
-  puma (= 2.11.2)
+  puma (= 4.3.12)
   pundit
   rack-cache
   rack-cors