diff --git a/Gemfile b/Gemfile index 3223d47..1e9029e 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '~> 6.0.0' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 3.12' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/Gemfile.lock b/Gemfile.lock index c2984a3..a459c75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.4) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) @@ -93,7 +95,8 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) pg (1.2.3) - puma (3.12.4) + puma (4.3.9) + nio4r (~> 2.0) rack (2.2.3) rack-proxy (0.6.5) rack @@ -193,7 +196,7 @@ DEPENDENCIES jbuilder (~> 2.7) listen (>= 3.0.5, < 3.2) pg (>= 0.18, < 2.0) - puma (~> 3.12) + puma (~> 4.3) rails (~> 6.0.0) rspec-rails (~> 3.8) sass-rails (~> 5)