diff --git a/Gemfile b/Gemfile index dd28d32..d1c5573 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'rails', '~> 5.2.1' gem 'mysql2' gem 'rubyXL' # 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 69b9caf..9dc7bc8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -111,7 +111,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (0.9.2) - mimemagic (0.3.2) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.1) mini_portile2 (2.3.0) minitest (5.11.3) @@ -122,7 +124,8 @@ GEM mini_portile2 (~> 2.3.0) popper_js (1.14.5) public_suffix (3.0.3) - puma (3.12.0) + puma (4.3.11) + nio4r (~> 2.0) rack (2.0.6) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -223,7 +226,7 @@ DEPENDENCIES jquery-rails listen (>= 3.0.5) mysql2 - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.1) rubyXL sass-rails (~> 5.0)