Merge remote-tracking branch 'upstream/pull/2970' into master

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 4699438a12a1be0399e785843e0175edd7e46550..6f0a20c7aa9b40f88895c2fb205847b89c32ed17 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 # Require rails
-gem "rails", "6.0.3.3"
+gem "rails", "6.0.3.4"
 
 # Require things which have moved to gems in ruby 1.9
 gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19
@@ -145,7 +145,7 @@ group :test do
   gem "erb_lint", :require => false
   gem "factory_bot_rails"
   gem "minitest", "~> 5.1"
-  gem "puma", "~> 4.3"
+  gem "puma", "~> 5.0"
   gem "rails-controller-testing"
   gem "rubocop"
   gem "rubocop-minitest"