diff --git a/Gemfile b/Gemfile index fffdd40..5bacab6 100644 --- a/Gemfile +++ b/Gemfile @@ -25,7 +25,7 @@ gem 'rails', '~> 5.2.3' # Use sqlite3 as the database for Active Record gem 'sqlite3' # Use Puma as the app server -gem 'puma', '~> 3.12' +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 9512f7e..909e6cf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,7 +153,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.12.2) @@ -173,7 +175,8 @@ GEM pg (1.1.4) popper_js (1.14.5) public_suffix (4.0.1) - puma (3.12.2) + puma (4.3.12) + nio4r (~> 2.0) rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -342,7 +345,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) minitest-rails (~> 3.0) pg - puma (~> 3.12) + puma (~> 4.3) rails (~> 5.2.3) rails-controller-testing rubocop-rails_config