Merge 390697b into 86827c0

Ch4s3 · Oct 5, 2018 · 41313fd · 41313fd
2 parents 86827c0 + 390697b
commit 41313fd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,7 +18,7 @@ gem 'oj'
 gem 'pg', '~> 1.0'
 gem 'pg_query', '>= 0.9.0'
 gem 'pghero'
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 gem 'rack-cors'
 gem 'sass-rails', '~> 5.0'
 gem 'sentry-raven'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
     pry-state (0.1.10)
       pry (>= 0.9.10, < 0.12.0)
     public_suffix (3.0.2)
-    puma (3.11.3)
+    puma (3.12.0)
     rack (2.0.5)
     rack-cors (1.0.2)
     rack-mini-profiler (0.10.7)
@@ -428,7 +428,7 @@ DEPENDENCIES
   pry-rescue
   pry-stack_explorer
   pry-state
-  puma (~> 3.11)
+  puma (~> 3.12)
   rack-cors
   rack-mini-profiler
   rails (~> 5.1.5)