Skip to content

Commit 5ddab74

Browse files
committed
Merge branch 'upstream' into batchTransaction
2 parents c99fe13 + d3810c2 commit 5ddab74

29 files changed

+3273
-403
lines changed

package-lock.json

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@parse/push-adapter": "3.0.0",
2525
"@parse/s3-files-adapter": "1.2.3",
2626
"@parse/simple-mailgun-adapter": "1.1.0",
27-
"apollo-server-express": "2.7.0",
27+
"apollo-server-express": "2.7.1",
2828
"bcryptjs": "2.4.3",
2929
"body-parser": "1.19.0",
3030
"commander": "2.20.0",
@@ -46,7 +46,7 @@
4646
"parse": "2.5.1",
4747
"pg-promise": "8.7.5",
4848
"redis": "2.8.0",
49-
"semver": "6.2.0",
49+
"semver": "6.3.0",
5050
"subscriptions-transport-ws": "0.9.16",
5151
"tv4": "1.3.0",
5252
"uuid": "3.3.2",
@@ -82,7 +82,7 @@
8282
"jasmine": "3.4.0",
8383
"jsdoc": "3.6.3",
8484
"jsdoc-babel": "0.5.0",
85-
"lint-staged": "9.2.0",
85+
"lint-staged": "9.2.1",
8686
"mongodb-runner": "4.3.2",
8787
"node-fetch": "2.6.0",
8888
"nyc": "14.1.1",

spec/MongoSchemaCollectionAdapter.spec.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ describe('MongoSchemaCollection', () => {
1111
_client_permissions: {
1212
get: true,
1313
find: true,
14+
count: true,
1415
update: true,
1516
create: true,
1617
delete: true,
@@ -19,6 +20,7 @@ describe('MongoSchemaCollection', () => {
1920
class_permissions: {
2021
get: { '*': true },
2122
find: { '*': true },
23+
count: { '*': true },
2224
update: { '*': true },
2325
create: { '*': true },
2426
delete: { '*': true },
@@ -69,6 +71,7 @@ describe('MongoSchemaCollection', () => {
6971
classLevelPermissions: {
7072
find: { '*': true },
7173
get: { '*': true },
74+
count: { '*': true },
7275
create: { '*': true },
7376
update: { '*': true },
7477
delete: { '*': true },

0 commit comments

Comments
 (0)