yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-30 00:37:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Alexandre Bodin 2019-07-23 11:20:57 +02:00
commit 2d871abf6a
3 changed files with 1067 additions and 1017 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/strapi-plugin-graphql/services/Query.js
View File

@ -52,14 +52,12 @@ module.exports = {
amountLimiting: (params = {}) => {
const { amountLimit } = strapi.plugins.graphql.config;
if (!params.limit) return params;
if (!amountLimit) return params;
if (params.limit === -1) {
if (!params.limit || params.limit === -1 || params.limit > amountLimit) {
params.limit = amountLimit;
} else if (params.limit < 0) {
params.limit = 0;
} else if (params.limit > amountLimit) {
params.limit = amountLimit;
}
return params;

2
packages/strapi/package.json
View File

@ -30,7 +30,7 @@
"koa-convert": "^1.2.0",
"koa-favicon": "^2.0.0",
"koa-i18n": "^2.1.0",
"koa-ip": "^1.0.0",
"koa-ip": "^2.0.0",
"koa-joi-router": "^6.0.0",
"koa-locale": "~1.3.0",
"koa-lusca": "~2.2.0",

2076
yarn.lock
View File

File diff suppressed because it is too large Load Diff