Skip to content

Commit

Permalink
Update deps. Closes #3383. Closes #3384. Closes #3385. Closes #3386. C…
Browse files Browse the repository at this point in the history
…loses #3387. Closes #3388. Closes #3389. Closes #3390. Closes #3391. Closes #3392. Closes #3393. Closes #3394. Closes #3395. Closes #3396. Closes #3397
  • Loading branch information
hueniverse committed Nov 29, 2016
1 parent 137be35 commit 0ca8cea
Show file tree
Hide file tree
Showing 6 changed files with 89 additions and 102 deletions.
2 changes: 1 addition & 1 deletion API.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# 15.2.x API Reference
# 16.0.x API Reference

- [Server](#server)
- [`new Server([options])`](#new-serveroptions)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Lead Maintainer: [Eran Hammer](https://github.com/hueniverse)
authentication, and other essential facilities for building web and services applications. **hapi** enables
developers to focus on writing reusable application logic in a highly modular and prescriptive approach.

Development version: **15.1.x** ([release notes](https://github.com/hapijs/hapi/issues?labels=release+notes&page=1&state=closed))
Development version: **16.0.x** ([release notes](https://github.com/hapijs/hapi/issues?labels=release+notes&page=1&state=closed))
[![Build Status](https://secure.travis-ci.org/hapijs/hapi.svg?branch=master)](http://travis-ci.org/hapijs/hapi)

For the latest updates, [change log](http://hapijs.com/updates), and release information visit [hapijs.com](http://hapijs.com) and follow [@hapijs](https://twitter.com/hapijs) on twitter. If you have questions, please open an issue in the
Expand Down
2 changes: 1 addition & 1 deletion lib/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ exports.connection = {
output: 'data',
parse: true,
timeout: 10 * 1000, // Determines how long to wait for receiving client payload. Defaults to 10 seconds
uploads: Os.tmpDir(),
uploads: Os.tmpdir(),
defaultContentType: 'application/json',
compression: {}
},
Expand Down
175 changes: 81 additions & 94 deletions npm-shrinkwrap.json
100755 → 100644

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "hapi",
"description": "HTTP Server framework",
"homepage": "http://hapijs.com",
"version": "15.2.0",
"version": "16.0.0",
"repository": {
"type": "git",
"url": "git://github.com/hapijs/hapi"
Expand All @@ -29,7 +29,7 @@
"hoek": "4.x.x",
"iron": "4.x.x",
"items": "2.x.x",
"joi": "9.x.x",
"joi": "10.x.x",
"mimos": "3.x.x",
"podium": "^1.2.x",
"shot": "3.x.x",
Expand Down
6 changes: 3 additions & 3 deletions test/validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ describe('validation', () => {
config: {
validate: {
query: {
verbose: Joi.boolean().when('$params.user', { is: Joi.exist(), otherwise: Joi.forbidden() })
verbose: Joi.boolean().truthy('true').when('$params.user', { is: Joi.exist(), otherwise: Joi.forbidden() })
}
}
}
Expand Down Expand Up @@ -155,7 +155,7 @@ describe('validation', () => {
config: {
validate: {
query: {
me: Joi.boolean().when('$auth.credentials.name', { is: Joi.ref('$params.user'), otherwise: Joi.forbidden() })
me: Joi.boolean().truthy('true').when('$auth.credentials.name', { is: Joi.ref('$params.user'), otherwise: Joi.forbidden() })
}
}
}
Expand Down Expand Up @@ -1669,7 +1669,7 @@ describe('validation', () => {
path: '/',
config: {
response: {
schema: Joi.boolean(),
schema: Joi.boolean().truthy('on'),
modify: true
}
},
Expand Down

0 comments on commit 0ca8cea

Please sign in to comment.