diff --git a/Gemfile b/Gemfile index 5981754..6452a30 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,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 6f83797..1c743ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -84,7 +84,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_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.11.3) @@ -101,7 +103,8 @@ GEM pry (~> 0.10) pry-rails (0.3.9) pry (>= 0.10.4) - puma (3.12.2) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.8) rack-proxy (0.6.5) rack @@ -186,7 +189,7 @@ DEPENDENCIES pg (>= 0.18, < 2.0) pry-byebug pry-rails - puma (~> 3.12) + puma (~> 4.3) rails (~> 6.0.0) sass-rails (~> 5) tzinfo-data