diff --git a/Gemfile b/Gemfile index cbb3fe8..d8f8595 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ gem 'rails', '~> 5.2.3' # Use sqlite3 as the database for Active Record gem 'mysql2' # 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 77fa749..db014b7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -103,7 +103,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.4) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) mini_racer (0.2.9) @@ -116,7 +118,8 @@ GEM mini_portile2 (~> 2.4.0) orm_adapter (0.5.0) public_suffix (4.0.3) - puma (3.12.2) + puma (4.3.12) + nio4r (~> 2.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -216,7 +219,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) mini_racer mysql2 - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.3) sass-rails (~> 5.0) selenium-webdriver