aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2013-09-24 10:55:13 -0700
committerXavier Noria <fxn@hashref.com>2013-09-24 10:55:13 -0700
commitb1178aef3b44bd9e0153d2c4f8a2a2a590949999 (patch)
tree21d9f0c531174397c0173d51b7a81834c372ba06 /railties
parent3cdeac8cb7e8ab2c11d3a512675a7cd825fbb83e (diff)
parent73b6095e13ef6be47fcabd65fcdd9c814bb9b375 (diff)
downloadrails-b1178aef3b44bd9e0153d2c4f8a2a2a590949999.tar.gz
rails-b1178aef3b44bd9e0153d2c4f8a2a2a590949999.tar.bz2
rails-b1178aef3b44bd9e0153d2c4f8a2a2a590949999.zip
Merge pull request #10822 from gaurish/pool
Add note about database connection pool in postgres template
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml2
1 files changed, 2 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
index eb569b7dab..0194dce6f3 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
+++ b/railties/lib/rails/generators/rails/app/templates/config/databases/postgresql.yml
@@ -55,6 +55,8 @@ production:
adapter: postgresql
encoding: unicode
database: <%= app_name %>_production
+ # For details on connection pooling, see rails configration guide
+ # http://guides.rubyonrails.org/configuring.html#database-pooling
pool: 5
username: <%= app_name %>
password: