aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRoberto Miranda <rjmaltamar@gmail.com>2017-02-17 15:14:35 -0500
committerRoberto Miranda <rjmaltamar@gmail.com>2017-02-20 18:23:53 -0500
commitbd163bdadf044e75a4812489d9f53a9feeb3cec7 (patch)
tree5c40158c3231428296c03b9154b142b75b8537dd /railties
parent46bf9eea533f8a2fedbb0aaad12cae1c5a4b9612 (diff)
downloadrails-bd163bdadf044e75a4812489d9f53a9feeb3cec7.tar.gz
rails-bd163bdadf044e75a4812489d9f53a9feeb3cec7.tar.bz2
rails-bd163bdadf044e75a4812489d9f53a9feeb3cec7.zip
Use Puma 3.7.x
ref this commit seems that has not been merged into 3.7 https://github.com/puma/puma/commit/42bec4600c51ab8a1c1ee5a0e1b738a4ffd82bf2
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
-rw-r--r--railties/test/generators/app_generator_test.rb2
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 ea88afe9f4..61c371d2bc 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -190,7 +190,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 ce29d93d6e..8c0f1a2725 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -339,7 +339,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