diff --git a/Gemfile b/Gemfile index c51d946..bf9229c 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem 'rails', '~> 6.0.0.rc1' # 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' # Use SCSS for stylesheets gem 'sass-rails', '~> 5' # Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker diff --git a/Gemfile.lock b/Gemfile.lock index fe10fb4..51797dc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -170,7 +170,9 @@ GEM mimemagic (~> 0.3.2) memoist (0.16.0) 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) @@ -214,7 +216,8 @@ GEM coderay (~> 1.1.0) method_source (~> 0.9.0) public_suffix (4.0.1) - puma (3.12.1) + puma (4.3.8) + nio4r (~> 2.0) rack (2.0.7) rack-proxy (0.6.5) rack @@ -384,7 +387,7 @@ DEPENDENCIES listen (>= 3.0.5, < 3.2) omniauth-facebook pg (>= 0.18, < 2.0) - puma (~> 3.11) + puma (~> 4.3) rails (~> 6.0.0.rc1) rails-controller-testing rspec-rails (~> 4.0.0.beta2)