diff --git a/Gemfile b/Gemfile index fec9bac..8ae75f5 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,7 @@ gem 'rails', '~> 5.2.2' # 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 c03e1c3..dee5cc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -142,7 +142,9 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.4) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) @@ -180,7 +182,8 @@ GEM rack pg (1.2.3) public_suffix (4.0.4) - puma (3.12.4) + puma (4.3.12) + nio4r (~> 2.0) rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -278,7 +281,7 @@ DEPENDENCIES omniauth-google-oauth2 omniauth-twitter pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.2) sass-rails (~> 5.0) spring