diff --git a/Gemfile b/Gemfile index 3e185b3..fc9dd1a 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.4', '>= 5.2.4.3' # Use mysql as the database for Active Record gem 'mysql2', '>= 0.4.4', '< 0.6.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 b12156f..f6a72d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -95,7 +95,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.1) @@ -105,7 +107,8 @@ GEM nokogiri (1.10.9) mini_portile2 (~> 2.4.0) public_suffix (4.0.5) - puma (3.12.6) + puma (4.3.8) + nio4r (~> 2.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -198,7 +201,7 @@ DEPENDENCIES jbuilder (~> 2.5) listen (>= 3.0.5, < 3.2) mysql2 (>= 0.4.4, < 0.6.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.4, >= 5.2.4.3) sass-rails (~> 5.0) selenium-webdriver