mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Upgrade Puma to 5.x

This commit is contained in:
Nate Berkopec 2020-10-30 18:19:16 -06:00
parent 82ab903653
commit b8af0fd2d7
No known key found for this signature in database
GPG Key ID: BDD7A4B8E43906A6
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Gemfile.lock
View File

@ -359,8 +359,8 @@ GEM
multipart-post (2.1.1) multipart-post (2.1.1)
mustache (1.1.1) mustache (1.1.1)
mustermann (1.0.3) mustermann (1.0.3)
nio4r (2.5.2) nio4r (2.5.4)
nio4r (2.5.2-java) nio4r (2.5.4-java)
nokogiri (1.10.10) nokogiri (1.10.10)
mini_portile2 (~> 2.4.0) mini_portile2 (~> 2.4.0)
nokogiri (1.10.10-java) nokogiri (1.10.10-java)
@ -378,9 +378,9 @@ GEM
pg (1.2.3-x86-mingw32) pg (1.2.3-x86-mingw32)
psych (3.1.0) psych (3.1.0)
public_suffix (4.0.6) public_suffix (4.0.6)
puma (4.3.1) puma (5.0.4)
nio4r (~> 2.0) nio4r (~> 2.0)
puma (4.3.1-java) puma (5.0.4-java)
nio4r (~> 2.0) nio4r (~> 2.0)
que (0.14.3) que (0.14.3)
qunit-selenium (0.0.4) qunit-selenium (0.0.4)

2
railties/lib/rails/generators/app_base.rb
View File

@ -200,7 +200,7 @@ module Rails
def web_server_gemfile_entry # :doc: def web_server_gemfile_entry # :doc:
return [] if options[:skip_puma] return [] if options[:skip_puma]
comment = "Use Puma as the app server" comment = "Use Puma as the app server"
GemfileEntry.new("puma", "~> 4.1", comment) GemfileEntry.new("puma", "~> 5.0", comment)
end end
def include_all_railties? # :doc: def include_all_railties? # :doc:

2
railties/test/generators/app_generator_test.rb
View File

@ -589,7 +589,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_generator_defaults_to_puma_version def test_generator_defaults_to_puma_version
run_generator [destination_root] run_generator [destination_root]
assert_gem "puma", "'~> 4.1'" assert_gem "puma", "'~> 5.0'"
end end
def test_generator_if_skip_puma_is_given def test_generator_if_skip_puma_is_given