Merge d2f93f1 into 3824ce7

psu-libraries · Feb 28, 2020 · 640bf80 · 640bf80
2 parents 3824ce7 + d2f93f1
commit 640bf80
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -41,7 +41,7 @@ gem 'mini_racer'
 gem 'newrelic_rpm'
 gem 'pg'
 gem 'psu_dir'
-gem 'puma', '~> 3.7'
+gem 'puma', '~> 3.12'
 gem 'rsolr', '>= 1.0'
 gem 'rubyzip'
 gem 'sass-rails', '~> 5.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -425,7 +425,7 @@ GEM
       namae (~> 1.0)
       net-ldap (~> 0.16.0)
     public_suffix (3.0.3)
-    puma (3.12.0)
+    puma (3.12.3)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
@@ -742,7 +742,7 @@ DEPENDENCIES
   pry-byebug
   pry-rails
   psu_dir
-  puma (~> 3.7)
+  puma (~> 3.12)
   rails (~> 5.1.6)
   rails-controller-testing
   rsolr (>= 1.0)