kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Merge pull request #23906 from schneems/schneems/puma-3-0

Browse source 
[close #23681] Use puma 3.0.0+
This commit is contained in:
Richard Schneeman 2016-02-26 08:54:05 -06:00
commit 364e155f97
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -181,7 +181,7 @@ module Rails
def webserver_gemfile_entry
return [] if options[:skip_puma]
comment = 'Use Puma as the app server'
GemfileEntry.new('puma', nil, comment)
GemfileEntry.new('puma', '~> 3.0', comment)
end
def include_all_railties?

5
railties/test/generators/app_generator_test.rb
View file

@ -366,6 +366,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
end
end
def test_generator_defaults_to_puma_version
run_generator [destination_root]
assert_gem "puma", "'~> 3.0'"
end
def test_generator_if_skip_puma_is_given
run_generator [destination_root, "--skip-puma"]
assert_no_file "config/puma.rb"