Merge branch 'master' into feat/openai-vector-searching

.github/mergify.yml

@@ -19,9 +19,9 @@ pull_request_rules:
       - author = dependabot[bot]
       - '#approved-reviews-by >= 1'
       - check-success = "check-title"
-      - check-success ~= "Node CI for slackbot-proxy \/.*"
-      - check-success ~= "Node CI for app development \/.*"
-      - check-success ~= "Node CI for app production \/.*"
+      - check-success ~= "Node CI for slackbot-proxy / .*"
+      - check-success ~= "Node CI for app development / .*"
+      - check-success ~= "Node CI for app production / .*"
     actions:
       merge:
         method: merge

apps/app/src/server/routes/apiv3/page/update-page.ts

@@ -54,7 +54,9 @@ export const updatePageHandlersFactory: UpdatePageHandlersFactory = (crowi) => {
       .withMessage("'revisionId' must be specified"),
     body('body').exists().isString()
       .withMessage("Empty value is not allowed for 'body'"),
-    body('grant').optional().isInt({ min: 0, max: 5 }).withMessage('grant must be integer from 1 to 5'),
+    body('grant').optional().not().isString()
+      .isInt({ min: 0, max: 5 })
+      .withMessage('grant must be an integer from 1 to 5'),
     body('userRelatedGrantUserGroupIds').optional().isArray().withMessage('userRelatedGrantUserGroupIds must be an array of group id'),
     body('overwriteScopesOfDescendants').optional().isBoolean().withMessage('overwriteScopesOfDescendants must be boolean'),
     body('isSlackEnabled').optional().isBoolean().withMessage('isSlackEnabled must be boolean'),