diff options
| author | Anthony Bellew <anthonyreflected@gmail.com> | 2017-01-25 20:53:57 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 20:53:57 -0700 |
| commit | 3d890c407356c8e0e7dd9b64e8e232ededcff8e8 (patch) | |
| tree | a22df9a8737250f97a6024943af3445a163917b3 /config/database.yml | |
| parent | febe2449bb14f3d877fb934ceb6d52e320712bac (diff) | |
| parent | 905c82917959a5afe24cb85c62c0b0ba13f0da8b (diff) | |
Merge pull request #3 from tootsuite/master
Updating to current
Diffstat (limited to 'config/database.yml')
| -rw-r--r-- | config/database.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/database.yml b/config/database.yml index 52c26f599..5ec342f93 100644 --- a/config/database.yml +++ b/config/database.yml @@ -1,6 +1,6 @@ default: &default adapter: postgresql - pool: <%= ENV["DB_POOL"] || ENV['RAILS_MAX_THREADS'] || 5 %> + pool: <%= ENV["DB_POOL"] || ENV['MAX_THREADS'] || 5 %> timeout: 5000 encoding: unicode |