diff --git a/Gemfile b/Gemfile index d2fae1d..b859b70 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.11' +gem 'puma', '~> 4.3' # Use SCSS for stylesheets gem 'sass-rails', '~> 5.0' # Use Uglifier as compressor for JavaScript assets diff --git a/Gemfile.lock b/Gemfile.lock index 0267498..84f3dcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -162,7 +162,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) @@ -201,7 +203,8 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.2) - puma (3.12.2) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.8) rack-cors (1.1.1) rack (>= 2.0.0) @@ -349,7 +352,7 @@ DEPENDENCIES omniauth-github pg (>= 0.18, < 2.0) pry-rails - puma (~> 3.11) + puma (~> 4.3) rack-cors rails (~> 6.0.0) rails-controller-testing