diff --git a/Gemfile b/Gemfile index e80f521..9ffc5a2 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'activeadmin' gem 'rails', '~> 5.2.3' # Use Puma as the app server gem 'pg' -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' gem 'sprockets-rails', '~> 3.0', '>= 3.0.4' diff --git a/Gemfile.lock b/Gemfile.lock index d93eabc..0b0eac3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -192,7 +192,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -202,7 +204,6 @@ GEM nokogiri (1.10.3) mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) - pagy (3.5.0) pg (1.1.4) pry (0.12.2) coderay (~> 1.1.0) @@ -213,7 +214,8 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (3.1.1) - puma (3.12.1) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.7) rack-proxy (0.6.5) rack @@ -372,11 +374,10 @@ DEPENDENCIES letter_opener listen (>= 3.0.5, < 3.2) mini_magick (~> 4.5, >= 4.5.1) - pagy (~> 3.5) pg pry-byebug pry-rails - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) react-rails rspec-rails (~> 3.8)