Merge pull request #342 from themarshallproject/dependabot/bundler/pu…

…ma-4.3.5 Bump puma from 3.12.6 to 4.3.5
themarshallproject · Jul 14, 2020 · 4c86ee4 · 4c86ee4
2 parents 00267bf + e3eb2cc
commit 4c86ee4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -16,7 +16,7 @@ gem 'sdoc', '~> 1.0.0', group: :doc
 
 gem 'rack-cache'
 gem 'bcrypt', '~> 3.1.12'
-gem 'puma', '~> 3.12'
+gem 'puma', '~> 4.3'
 gem 'rails_12factor'
 
 gem 'simple_form', '~> 5.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -172,7 +172,8 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.3)
-    puma (3.12.6)
+    puma (4.3.5)
+      nio4r (~> 2.0)
     rack (2.2.3)
     rack-cache (1.9.0)
       rack (>= 0.4)
@@ -329,7 +330,7 @@ DEPENDENCIES
   letter_opener
   pg (~> 0.21)
   premailer-rails
-  puma (~> 3.12)
+  puma (~> 4.3)
   rack-cache
   rails (~> 5.2.4)
   rails-controller-testing