diff --git a/Gemfile b/Gemfile index 3aaec69..12529fb 100644 --- a/Gemfile +++ b/Gemfile @@ -8,7 +8,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' # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder gem 'jbuilder', '~> 2.7' # Use Redis adapter to run Action Cable in production diff --git a/Gemfile.lock b/Gemfile.lock index c4359d4..f751288 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,6 +69,7 @@ GEM factory_bot_rails (5.0.2) factory_bot (~> 5.0.2) railties (>= 4.2.0) + ffi (1.12.1) ffi (1.12.1-x64-mingw32) globalid (0.4.2) activesupport (>= 4.2.0) @@ -99,13 +100,18 @@ GEM mini_mime (1.0.2) mini_portile2 (2.4.0) minitest (5.14.0) + msgpack (1.3.1) msgpack (1.3.1-x64-mingw32) multi_xml (0.6.0) nio4r (2.5.2) + nokogiri (1.10.7) + mini_portile2 (~> 2.4.0) nokogiri (1.10.7-x64-mingw32) mini_portile2 (~> 2.4.0) + pg (1.2.2) pg (1.2.2-x64-mingw32) - puma (3.12.2) + puma (4.3.12) + nio4r (~> 2.0) rack (2.1.1) rack-cors (1.1.1) rack (>= 2.0.0) @@ -180,6 +186,7 @@ GEM PLATFORMS x64-mingw32 + x86_64-linux DEPENDENCIES bootsnap (>= 1.4.2) @@ -191,7 +198,7 @@ DEPENDENCIES jwt nokogiri pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rack-cors rails (~> 6.0.0) rspec-rails