diff --git a/Gemfile b/Gemfile index ebb2029..05e7f92 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ ruby '2.5.3' gem 'rails', '~> 5.2.4', '>= 5.2.4.3' gem 'json' gem 'pg', '>= 0.18', '< 2.0' -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' gem 'sass-rails', '~> 5.0' gem 'uglifier', '>= 1.3.0' gem 'coffee-rails', '~> 4.2' diff --git a/Gemfile.lock b/Gemfile.lock index e59044f..b692210 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,7 +121,9 @@ GEM marcel (0.3.3) mimemagic (~> 0.3.2) method_source (1.0.0) - mimemagic (0.3.5) + mimemagic (0.3.10) + nokogiri (~> 1) + rake mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.1) @@ -154,7 +156,8 @@ GEM coderay (~> 1.1) method_source (~> 1.0) public_suffix (4.0.5) - puma (3.12.6) + puma (4.3.8) + nio4r (~> 2.0) rack (2.2.3) rack-test (1.1.0) rack (>= 1.0, < 3) @@ -288,7 +291,7 @@ DEPENDENCIES omniauth-google-oauth2 pg (>= 0.18, < 2.0) pry - puma (~> 3.11) + puma (~> 4.3) rails (~> 5.2.4, >= 5.2.4.3) rspec-rails sass-rails (~> 5.0)