Merge pull request #40 from kaishuu0123/dependabot/bundler/puma-3.12.2

Bump puma from 3.12.1 to 3.12.2
kaishuu0123 · Dec 12, 2019 · 7f104f3 · 7f104f3
2 parents ee7dec1 + 5e7d2f1
commit 7f104f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -8,7 +8,7 @@ ruby '2.5.3'
 gem 'rails', '~> 6.0.0'
 # Use Puma as the app server
 # Puma is a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack applications (http://puma.io)
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 # Sass adapter for the Rails asset pipeline. (https://github.com/rails/sass-rails)
 gem 'sass-rails', '~> 5'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (4.0.1)
-    puma (3.12.1)
+    puma (3.12.2)
     rack (2.0.7)
     rack-proxy (0.6.5)
       rack
@@ -377,7 +377,7 @@ DEPENDENCIES
   paper_trail (~> 10.3.0)
   pg (~> 1.1)
   pry
-  puma (~> 3.11)
+  puma (~> 3.12)
   rails (~> 6.0.0)
   rails-i18n (~> 6.0.0)
   rails-settings-cached (~> 2.0)