Merge branch 'develop' of github.com:outline/outline into feat/mass-import

2020-12-19 16:01:10 -08:00
parent b98e4bb1ff 117d278d16
commit 7f5a7d7df7
8 changed files with 127 additions and 7 deletions
--- a/server/utils/s3.js
+++ b/server/utils/s3.js
@@ -59,7 +59,7 @@ export const makePolicy = (
    expiration: format(tomorrow, "YYYY-MM-DDTHH:mm:ss\\Z"),
  };

-  return new Buffer(JSON.stringify(policy)).toString("base64");
+  return Buffer.from(JSON.stringify(policy)).toString("base64");
 };

 export const getSignature = (policy: any) => {