Skip to content

Commit f76e499

Browse files
Merge branch 'master' of https://github.com/nestjs/nest
2 parents e83b115 + 537cfb8 commit f76e499

82 files changed

Lines changed: 5461 additions & 2346 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -236,8 +236,8 @@ Footer should contain a [closing reference to an issue](https://help.github.com/
236236
Samples: (even more [samples](https://github.com/nestjs/nest/commits/master))
237237
238238
```
239-
docs(changelog) update change log to beta.5
240-
bugfix(core) need to depend on latest rxjs and zone.js
239+
docs(changelog): update change log to beta.5
240+
bugfix(core): need to depend on latest rxjs and zone.js
241241
```
242242
243243
### Revert

integration/graphql/package-lock.json

Lines changed: 50 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/graphql/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"start:prod": "node dist/main.js"
1010
},
1111
"dependencies": {
12-
"@nestjs/common": "6.11.5",
13-
"@nestjs/core": "6.11.5",
12+
"@nestjs/common": "6.11.6",
13+
"@nestjs/core": "6.11.6",
1414
"@nestjs/graphql": "6.5.4",
15-
"apollo-server-express": "2.9.16",
15+
"apollo-server-express": "2.10.0",
1616
"graphql": "14.6.0",
1717
"graphql-tools": "4.0.6",
1818
"reflect-metadata": "0.1.13",

integration/hello-world/package-lock.json

Lines changed: 15 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/hello-world/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
"start": "ts-node src/main"
88
},
99
"dependencies": {
10-
"@nestjs/common": "6.11.5",
11-
"@nestjs/core": "6.11.5",
12-
"@nestjs/microservices": "6.11.5",
13-
"@nestjs/testing": "6.11.5",
14-
"@nestjs/websockets": "6.11.5",
10+
"@nestjs/common": "6.11.6",
11+
"@nestjs/core": "6.11.6",
12+
"@nestjs/microservices": "6.11.6",
13+
"@nestjs/testing": "6.11.6",
14+
"@nestjs/websockets": "6.11.6",
1515
"class-transformer": "0.2.3",
1616
"class-validator": "0.11.0",
1717
"fastify": "2.10.0",

integration/hooks/package-lock.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

integration/hooks/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"start": "ts-node src/main"
88
},
99
"dependencies": {
10-
"@nestjs/common": "6.11.5",
11-
"@nestjs/core": "6.11.5",
10+
"@nestjs/common": "6.11.6",
11+
"@nestjs/core": "6.11.6",
1212
"class-transformer": "0.2.3",
1313
"class-validator": "0.11.0",
1414
"reflect-metadata": "0.1.13",

0 commit comments

Comments
 (0)