Merge 739761b into 5a8f204

mbulat · Dec 6, 2019 · bea352b · bea352b
2 parents 5a8f204 + 739761b
commit bea352b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/fixture_rails_root/Gemfile b/fixture_rails_root/Gemfile
@@ -11,7 +11,7 @@ gem 'rails', '~> 5.1.2'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3'
 # Use Puma as the app server
-gem 'puma', '~> 3.7'
+gem 'puma', '~> 4.3'
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 5.0'
 # Use Uglifier as compressor for JavaScript assets

diff --git a/fixture_rails_root/Gemfile.lock b/fixture_rails_root/Gemfile.lock
@@ -114,7 +114,8 @@ GEM
     nokogiri (1.10.4)
       mini_portile2 (~> 2.4.0)
     public_suffix (4.0.1)
-    puma (3.12.1)
+    puma (4.3.1)
+      nio4r (~> 2.0)
     rack (2.0.7)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -205,7 +206,7 @@ DEPENDENCIES
   jbuilder (~> 2.5)
   listen (>= 3.0.5, < 3.2)
   plutus!
-  puma (~> 3.7)
+  puma (~> 4.3)
   rails (~> 5.1.2)
   sass-rails (~> 5.0)
   selenium-webdriver