diff options
| author | Guillermo Iguaran <guilleiguaran@gmail.com> | 2017-02-21 15:09:26 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-21 15:09:26 +0900 |
| commit | de4c9186d8bd03b1957dec6b7c84bfbeef9c31aa (patch) | |
| tree | 44c83cc50728899e1b94b52921093f59df788f17 /railties | |
| parent | c1d57d74acf7c3cb06cb3e641111d592a8a174a8 (diff) | |
| parent | bd163bdadf044e75a4812489d9f53a9feeb3cec7 (diff) | |
| download | rails-de4c9186d8bd03b1957dec6b7c84bfbeef9c31aa.tar.gz rails-de4c9186d8bd03b1957dec6b7c84bfbeef9c31aa.tar.bz2 rails-de4c9186d8bd03b1957dec6b7c84bfbeef9c31aa.zip | |
Merge pull request #28055 from robertomiranda/patch-3
Use Puma 3.7
Diffstat (limited to 'railties')
| -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 e55da93f45..f365ad05c7 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -193,7 +193,7 @@ module Rails def webserver_gemfile_entry # :doc: return [] if options[:skip_puma] comment = "Use Puma as the app server" - GemfileEntry.new("puma", "~> 3.0", comment) + GemfileEntry.new("puma", "~> 3.7", 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 687aed2c47..bd1b412b36 100644 --- a/railties/test/generators/app_generator_test.rb +++ b/railties/test/generators/app_generator_test.rb @@ -340,7 +340,7 @@ class AppGeneratorTest < Rails::Generators::TestCase def test_generator_defaults_to_puma_version run_generator [destination_root] - assert_gem "puma", "'~> 3.0'" + assert_gem "puma", "'~> 3.7'" end def test_generator_if_skip_puma_is_given |