diff --git a/Gemfile b/Gemfile index 40904eb..28d3d1d 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.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 33a42ef..0684710 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -112,7 +112,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) @@ -125,7 +127,8 @@ GEM nokogiri (1.10.3) mini_portile2 (~> 2.4.0) public_suffix (3.1.1) - puma (3.12.1) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.7) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -229,7 +232,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.3) sass-rails (~> 5.0) selenium-webdriver