Merge 09c58b8 into 94971e1

SpotswoodCollege · Aug 9, 2019 · c20faaa · c20faaa
2 parents 94971e1 + 09c58b8
commit c20faaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -15,7 +15,7 @@ gem 'coveralls', require: false
 gem 'pg'
 
 # Use Puma as the app server
-gem 'puma', '~> 3.12'
+gem 'puma', '~> 4.1'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -139,7 +139,8 @@ GEM
     orm_adapter (0.5.0)
     pg (1.1.3)
     public_suffix (3.0.3)
-    puma (3.12.0)
+    puma (4.1.0)
+      nio4r (~> 2.0)
     rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -264,7 +265,7 @@ DEPENDENCIES
   letter_opener
   listen (>= 3.0.5, < 3.2)
   pg
-  puma (~> 3.12)
+  puma (~> 4.1)
   rails (~> 5.2.2)
   rails_real_favicon
   sass-rails (~> 5.0)