diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-11-27 00:36:05 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 00:36:05 -0500 |
| commit | 28333d62ee15ec95cc4270c880c90f395e075b3b (patch) | |
| tree | ec73dba4dc0a1cd51aee00a76964f8fb9ef15d32 | |
| parent | 959d7f73a7825ff7d62b5df3ed8b4ca3006db331 (diff) | |
| parent | 0d8fd6107f47b78f2694a7613648e6fc24374ec2 (diff) | |
| download | rails-28333d62ee15ec95cc4270c880c90f395e075b3b.tar.gz rails-28333d62ee15ec95cc4270c880c90f395e075b3b.tar.bz2 rails-28333d62ee15ec95cc4270c880c90f395e075b3b.zip | |
Merge pull request #31236 from y-yagi/use_puma_311_in_new_apps
Use Puma 3.11 in newly generated applications
| -rw-r--r-- | railties/lib/rails/generators/app_base.rb | 2 | ||||
| -rw-r--r-- | railties/test/generators/app_generator_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index 73256bec61..049f9935b8 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -192,7 +192,7 @@ module Rails def webserver_gemfile_entry # :doc: return [] if options[:skip_puma] comment = "Use Puma as the app server" - GemfileEntry.new("puma", "~> 3.7", comment) + GemfileEntry.new("puma", "~> 3.11", 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 fddfab172e..ff69366875 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -457,7 +457,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_defaults_to_puma_version run_generator [destination_root] - assert_gem "puma", "'~> 3.7'" + assert_gem "puma", "'~> 3.11'" end def test_generator_if_skip_puma_is_given |