diff --git a/Gemfile b/Gemfile index 47fcd57b..817b70b3 100644 --- a/Gemfile +++ b/Gemfile @@ -16,7 +16,7 @@ gem 'rails', '~> 6.0.0' # Use postgresql as the database for Active Record gem 'pg', '>= 0.18', '< 2.0' # Use Puma as the app server -gem 'puma', '~> 3.11' +gem 'puma', '~> 4.3' gem "pundit" diff --git a/Gemfile.lock b/Gemfile.lock index 4a2183db..9d59788b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -160,7 +160,9 @@ GEM mimemagic (~> 0.3.2) maruku (0.7.3) 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.0) @@ -199,7 +201,8 @@ GEM pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - puma (3.12.4) + puma (4.3.8) + nio4r (~> 2.0) pundit (2.1.0) activesupport (>= 3.0.0) rack (2.2.2) @@ -380,7 +383,7 @@ DEPENDENCIES omniauth-google-oauth2 pg (>= 0.18, < 2.0) pry-byebug - puma (~> 3.11) + puma (~> 4.3) pundit rails (~> 6.0.0) rails_admin (~> 2.0)