Merge commit '124d7c824a68139df4998f24a5dbb39391e22850'

zauberware · Feb 18, 2020 · eb2e373 · eb2e373
2 parents 429f495 + 124d7c8
commit eb2e373
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 'rack-cors'
 # gem 'graphiql-rails', group: :development
 
 # Use Puma as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 3.12'
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 # gem 'jbuilder', '~> 2.5'
 # Use Redis adapter to run Action Cable in production

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -139,7 +139,7 @@ GEM
       equatable (~> 0.6)
       tty-color (~> 0.5)
     pg (1.1.4)
-    puma (3.12.1)
+    puma (3.12.2)
     rack (2.0.8)
     rack-cors (1.0.3)
     rack-test (1.1.0)
@@ -266,7 +266,7 @@ DEPENDENCIES
   graphql-errors
   listen (>= 3.0.5, < 3.2)
   pg
-  puma (~> 3.11)
+  puma (~> 3.12)
   rack-cors
   rails (~> 6.0.2)
   rails-controller-testing