Merge 57957c5 into a595ab4

SUSE · Feb 5, 2020 · 767eada · 767eada
2 parents a595ab4 + 57957c5
commit 767eada
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Gemfile b/Gemfile
@@ -83,7 +83,7 @@ gem 'paperclip', '~> 5.2'
 # as deployer
 gem 'mina', '~> 0.3'
 # as the app server
-gem 'puma', '~> 3.11'
+gem 'puma', '~> 4.3'
 # as the log formater
 gem 'lograge'
 # for speeding up application boot

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,8 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.3)
-    puma (3.12.2)
+    puma (4.3.1)
+      nio4r (~> 2.0)
     rack (2.1.1)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -397,7 +398,7 @@ DEPENDENCIES
   poltergeist
   pry-byebug
   pry-rails
-  puma (~> 3.11)
+  puma (~> 4.3)
   rails (~> 5.2)
   rails-controller-testing
   rails-jquery-autocomplete