Merge pull request #2485 from TracksApp/dependabot/bundler/puma-5.0.0

Bump puma from 4.3.6 to 5.0.0
TracksApp · Sep 19, 2020 · 12cf4f9 · 12cf4f9
2 parents e661cef + 01223eb
commit 12cf4f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -33,7 +33,7 @@ gem "acts_as_list"
 gem "aasm", '~> 5.1.1'
 gem "htmlentities"
 gem "rails_autolink"
-gem 'puma', '~> 4.3'
+gem 'puma', '~> 5.0'
 gem 'paperclip'
 
 # To use ActiveModel has_secure_password

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -151,7 +151,7 @@ GEM
     minitest-stub-const (0.6)
     mocha (1.11.2)
     mysql2 (0.5.3)
-    nio4r (2.5.3)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
@@ -166,7 +166,7 @@ GEM
     parser (2.7.1.4)
       ast (~> 2.4.1)
     pg (1.2.3)
-    puma (4.3.6)
+    puma (5.0.0)
       nio4r (~> 2.0)
     rack (2.2.3)
     rack-mini-profiler (2.1.0)
@@ -328,7 +328,7 @@ DEPENDENCIES
   mysql2 (~> 0.5.3)
   paperclip
   pg (~> 1.2.3)
-  puma (~> 4.3)
+  puma (~> 5.0)
   rack-mini-profiler
   rails (~> 6.0.3)
   rails-controller-testing