diff --git a/Gemfile b/Gemfile index 8fb5d9b1..b109b986 100644 --- a/Gemfile +++ b/Gemfile @@ -11,7 +11,7 @@ gem 'rails', '~> 5.2.0' # Use postgresql as the database for Active Record gem 'pg', '~> 0.18' # Use Puma as the app server -gem 'puma', '~> 3.0' +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 4764ba81..83898a13 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -119,7 +119,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.2) @@ -135,7 +137,8 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.5) - puma (3.12.6) + puma (4.3.12) + nio4r (~> 2.0) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -244,7 +247,7 @@ DEPENDENCIES mustache pg (~> 0.18) pry - puma (~> 3.0) + puma (~> 4.3) rails (~> 5.2.0) rb-readline rubocop