aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman@gmail.com>2016-02-26 08:54:05 -0600
committerRichard Schneeman <richard.schneeman@gmail.com>2016-02-26 08:54:05 -0600
commit364e155f97f3144c06e10f045b7182ed6ee071a1 (patch)
treee3518871362c2408a79bc377d8a09e2b95ed5666 /railties/lib
parent56ca2061df83a307943a0ffdfe6f5f4ed5846cf7 (diff)
parent8374b2fc852050cd26ddd91cf82e3d819a2b63ef (diff)
downloadrails-364e155f97f3144c06e10f045b7182ed6ee071a1.tar.gz
rails-364e155f97f3144c06e10f045b7182ed6ee071a1.tar.bz2
rails-364e155f97f3144c06e10f045b7182ed6ee071a1.zip
Merge pull request #23906 from schneems/schneems/puma-3-0
[close #23681] Use puma 3.0.0+
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/generators/app_base.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb
index ed4e73fb90..89341e6fa2 100644
--- a/railties/lib/rails/generators/app_base.rb
+++ b/railties/lib/rails/generators/app_base.rb
@@ -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?