1
0
mirror of https://github.com/Unleash/unleash.git synced 2024-12-22 19:07:54 +01:00

upgrade knex

This commit is contained in:
ivaosthu 2016-05-06 09:39:37 +02:00 committed by Ivar Conradi Østhus
parent 13a5ccb61f
commit 2e6f4187c5
3 changed files with 9 additions and 2 deletions

4
.vscode/settings.json vendored Normal file
View File

@ -0,0 +1,4 @@
// Place your settings in this file to overwrite default and user settings.
{
"files.autoSave": "onFocusChange"
}

View File

@ -42,7 +42,10 @@ function createDbPool() {
return knex({ return knex({
client: 'pg', client: 'pg',
connection: isTestEnv() ? getTestDatabaseUrl() : getDatabaseUrl(), connection: isTestEnv() ? getTestDatabaseUrl() : getDatabaseUrl(),
pool: { min: 2, max: 20 } pool: {
min: 2,
max: 20
}
}); });
} }

View File

@ -49,7 +49,7 @@
"ini": "1.3.3", "ini": "1.3.3",
"jsx-loader": "0.12.2", "jsx-loader": "0.12.2",
"jsxhint": "0.13.2", "jsxhint": "0.13.2",
"knex": "^0.10.0", "knex": "^0.11.0",
"lodash": "^3.5.0", "lodash": "^3.5.0",
"log4js": "0.6.22", "log4js": "0.6.22",
"moment": "^2.11.2", "moment": "^2.11.2",