Merge bbd9f9d into 5a2790a

SpotswoodCollege · Aug 18, 2018 · f61d86d · f61d86d
2 parents 5a2790a + bbd9f9d
commit f61d86d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -28,7 +28,7 @@ group :test, :production do
 end
 
 # Use Puma as the app server
-gem 'puma', '~> 3.7'
+gem 'puma', '~> 3.12'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -107,7 +107,7 @@ GEM
       mini_portile2 (~> 2.3.0)
     pg (1.0.0)
     public_suffix (3.0.2)
-    puma (3.11.4)
+    puma (3.12.0)
     rack (2.0.5)
     rack-test (1.0.0)
       rack (>= 1.0, < 3)
@@ -209,7 +209,7 @@ DEPENDENCIES
   listen (>= 3.0.5, < 3.2)
   mysql2
   pg
-  puma (~> 3.7)
+  puma (~> 3.12)
   rails (~> 5.2.0)
   sass-rails (~> 5.0)
   selenium-webdriver