diff --git a/Gemfile b/Gemfile index 0d49150..c109a36 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.4', '>= 5.2.4.1' # 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 eb34a4b..a81dcc7 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.3) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_magick (4.9.5) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -144,7 +146,8 @@ GEM pry-rails (0.3.9) pry (>= 0.10.4) public_suffix (4.0.1) - puma (3.12.2) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.8) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -284,7 +287,7 @@ DEPENDENCIES popper_js pry-byebug pry-rails - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.4, >= 5.2.4.1) rails-i18n (~> 5.1) redis-rails