From b0a2733943acd4c49e54acda941732ac6c332a21 Mon Sep 17 00:00:00 2001
From: Russell Sim <rsim@zendesk.com>
Date: Mon, 25 Jan 2021 16:35:16 +0100
Subject: [PATCH 1/2] Update puma

Older versions of puma don't work on newer versions of OSX
https://github.com/puma/puma/issues/2304

I had to bump this gem to get `bundle install` to work
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index ee8287d2d9..0e6fce7ce8 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ end
 
 gem 'bundler'
 gem 'dogstatsd-ruby'
-gem 'puma'
+gem 'puma', '= 4.3.6'
 gem 'attr_encrypted'
 gem 'sawyer'
 gem 'dalli'
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ca93ad318..b662ac4fda 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -474,7 +474,7 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (4.0.5)
-    puma (4.3.5)
+    puma (4.3.6)
       nio4r (~> 2.0)
     pyu-ruby-sasl (0.0.3.3)
     racc (1.5.2)
@@ -685,7 +685,7 @@ DEPENDENCIES
   pry-rails
   pry-rescue
   pry-stack_explorer
-  puma
+  puma (= 4.3.6)
   rack-mini-profiler
   rails (~> 6.0.3)
   rails-assets-bootstrap-select!

From 8ef048d35ebf61a79e8dec99a24640677c55e094 Mon Sep 17 00:00:00 2001
From: Russell Sim <rsim@zendesk.com>
Date: Tue, 26 Jan 2021 11:17:01 +0100
Subject: [PATCH 2/2] Update Gemfile

Co-authored-by: Michael Grosser <michael@grosser.it>
---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 0e6fce7ce8..ee8287d2d9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ end
 
 gem 'bundler'
 gem 'dogstatsd-ruby'
-gem 'puma', '= 4.3.6'
+gem 'puma'
 gem 'attr_encrypted'
 gem 'sawyer'
 gem 'dalli'