Merge remote-tracking branch 'origin/master' into feat/gcs-upload

CHANGES.md

@@ -1,6 +1,11 @@
 # CHANGES
 
-## 3.5.16-RC
+## 3.5.17-RC
+
+* Fix: Use HTTP PlantUML URL in default
+    * Introduced by 3.5.12
+
+## 3.5.16
 
 * Fix: Full Text Search doesn't work after when building indices
     * Introduced by 3.5.12

package.json

@@ -1,6 +1,6 @@
 {
   "name": "growi",
-  "version": "3.5.16-RC",
+  "version": "3.5.17-RC",
   "description": "Team collaboration software using markdown",
   "tags": [
     "wiki",

src/client/js/util/markdown-it/plantuml.js

@@ -7,7 +7,8 @@ export default class PlantUMLConfigurer {
     this.crowi = crowi;
     const config = crowi.getConfig();
 
-    this.serverUrl = config.env.PLANTUML_URI || 'https://plantuml.com/plantuml';
+    // Do NOT use HTTPS URL because plantuml.com refuse request except from members
+    this.serverUrl = config.env.PLANTUML_URI || 'http://plantuml.com/plantuml';
 
     this.generateSource = this.generateSource.bind(this);
   }

src/server/routes/attachment.js

@@ -203,7 +203,8 @@ module.exports = function(crowi, app) {
    * @apiGroup Attachment
    */
   api.limit = async function(req, res) {
-    return res.json(ApiResponse.success(await fileUploader.checkLimit(req.query.fileSize)));
+    const fileSize = Number(req.query.fileSize);
+    return res.json(ApiResponse.success(await fileUploader.checkLimit(fileSize)));
   };
 
   /**