From b8af0fd2d7dc7ed727937871654dde90e30a5ffc Mon Sep 17 00:00:00 2001 From: Nate Berkopec Date: Fri, 30 Oct 2020 18:19:16 -0600 Subject: [PATCH] Upgrade Puma to 5.x --- Gemfile.lock | 8 ++++---- railties/lib/rails/generators/app_base.rb | 2 +- railties/test/generators/app_generator_test.rb | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 13f6157b65b..2e72a94767d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -359,8 +359,8 @@ GEM multipart-post (2.1.1) mustache (1.1.1) mustermann (1.0.3) - nio4r (2.5.2) - nio4r (2.5.2-java) + nio4r (2.5.4) + nio4r (2.5.4-java) nokogiri (1.10.10) mini_portile2 (~> 2.4.0) nokogiri (1.10.10-java) @@ -378,9 +378,9 @@ GEM pg (1.2.3-x86-mingw32) psych (3.1.0) public_suffix (4.0.6) - puma (4.3.1) + puma (5.0.4) nio4r (~> 2.0) - puma (4.3.1-java) + puma (5.0.4-java) nio4r (~> 2.0) que (0.14.3) qunit-selenium (0.0.4) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index a855aad133c..2ad69fc334f 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -200,7 +200,7 @@ module Rails def web_server_gemfile_entry # :doc: return [] if options[:skip_puma] comment = "Use Puma as the app server" - GemfileEntry.new("puma", "~> 4.1", comment) + GemfileEntry.new("puma", "~> 5.0", comment) end def include_all_railties? # :doc: diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb index 9f920508b74..f672b75c465 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -589,7 +589,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_defaults_to_puma_version run_generator [destination_root] - assert_gem "puma", "'~> 4.1'" + assert_gem "puma", "'~> 5.0'" end def test_generator_if_skip_puma_is_given