From d5635c3a8914c1fe40367df7be7e5f440bb1b643 Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Fri, 1 Nov 2024 23:09:16 -0700 Subject: [PATCH 1/8] Update `ldap-sync.py` reference Signed-off-by: Emmanuel Ferdman --- docs/Login/LDAP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Login/LDAP.md b/docs/Login/LDAP.md index d2671fe89..ba9d299e0 100644 --- a/docs/Login/LDAP.md +++ b/docs/Login/LDAP.md @@ -1,6 +1,6 @@ ## LDAP info -- [LDAP sync script, that also correctly removes users](https://github.com/wekan/wekan/blob/main/ldap-sync/ldap-sync.py) +- [LDAP sync script, that also correctly removes users](https://github.com/wekan/wekan/blob/main/docs/Login/ldap-sync/ldap-sync.py) - [LDAP AD Simple Auth](LDAP-AD-Simple-Auth) 2021-07-24 and related [Search Filter Settings](https://github.com/wekan/wekan/issues/3908#issuecomment-887545168): ``` From 751b51916769cc7facc31d77ea5e2d60ea167cb4 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:17:34 +0200 Subject: [PATCH 2/8] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d45a8971a..809e00301 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,6 +27,8 @@ This release adds the following updates: Thanks to xet7. - [Copied from Sandstorm developer discussions to docs fix for running Sandstorm at Ubuntu 24.04](https://github.com/wekan/wekan/commit/8ac9353c5313402e00160843ca57405ebeb128cb). Thanks to xet7. +- [Update ldap-sync.py reference](https://github.com/wekan/wekan/pull/5555). + Thanks to emmanuel-ferdman. Thanks to above GitHub users for their contributions and translators for their translations. From b24acefa6f6696b702f2c3ceb28d6d6290017bb2 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:18:14 +0200 Subject: [PATCH 3/8] Updated dependencies. Thanks to developers of dependencies! --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index a934dcdcc..d2f7e6f0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1373,9 +1373,9 @@ "integrity": "sha512-SBbbYWvFYvsxHVL+q6ZB8lT3rp2LSvfALD2V52H+MGH2IgJsevy0VtXRkRG0EsUewwOaDTIKBn9DlD8HQ3GSwg==" }, "meteor-node-stubs": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.10.tgz", - "integrity": "sha512-zP1AVg8sOATz15yfy11R2VTx+IZFfAOXi8GuZa8tOfeVT1tKaqDooAbFylnIXwpStSu6HRBUhQqHtR06Qr9aEA==", + "version": "1.2.12", + "resolved": "https://registry.npmjs.org/meteor-node-stubs/-/meteor-node-stubs-1.2.12.tgz", + "integrity": "sha512-mzp3KI2aGNDhFlCVXPd0pfMr2z9A5vl1AqEgV13/z7AgKwcbd2X+ymE6tpSAMkrrQb40PU9PC2B59bCb6XkAaw==", "requires": { "@meteorjs/crypto-browserify": "^3.12.1", "assert": "^2.1.0", @@ -1384,7 +1384,7 @@ "console-browserify": "^1.2.0", "constants-browserify": "^1.0.0", "domain-browser": "^4.23.0", - "elliptic": "^6.5.7", + "elliptic": "^6.6.0", "events": "^3.3.0", "https-browserify": "^1.0.0", "os-browserify": "^0.3.0", @@ -1711,7 +1711,7 @@ "bundled": true }, "elliptic": { - "version": "6.5.7", + "version": "6.6.0", "bundled": true, "requires": { "bn.js": "^4.11.9", diff --git a/package.json b/package.json index 6356e2573..aa9e36106 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "markdown-it-emoji": "^2.0.0", "markdown-it-mathjax3": "^4.3.2", "meteor-accounts-t9n": "^2.6.0", - "meteor-node-stubs": "^1.2.10", + "meteor-node-stubs": "^1.2.12", "minio": "^7.1.3", "moment": "^2.29.4", "os": "^0.1.2", From 282a5b30f9575347bc632552b34dd96e466473ee Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:19:50 +0200 Subject: [PATCH 4/8] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 809e00301..68d796e5e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,6 +29,8 @@ This release adds the following updates: Thanks to xet7. - [Update ldap-sync.py reference](https://github.com/wekan/wekan/pull/5555). Thanks to emmanuel-ferdman. +- [Updated dependencies](https://github.com/wekan/wekan/commit/b24acefa6f6696b702f2c3ceb28d6d6290017bb2). + Thanks to developers of dependencies. Thanks to above GitHub users for their contributions and translators for their translations. From 324be07b859937966f98feb2aeea8f344c689bb0 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:34:51 +0200 Subject: [PATCH 5/8] Add more stack size. Thanks to xet7 ! --- Dockerfile | 2 +- Dockerfile.arm64v8 | 2 +- releases/virtualbox/start-wekan.sh | 2 +- snap-src/bin/wekan-control | 2 +- stacksmith/user-scripts/run.sh | 4 ++-- start-wekan.sh | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 28d9cada4..bdb6da3f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -272,4 +272,4 @@ WORKDIR /home/wekan/app # # CMD ["node", "/build/main.js"] # CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 /build/main.js"] -CMD ["bash", "-c", "ulimit -s 65500; exec node /build/main.js"] +CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /build/main.js"] diff --git a/Dockerfile.arm64v8 b/Dockerfile.arm64v8 index f4fb3325e..6731b1380 100644 --- a/Dockerfile.arm64v8 +++ b/Dockerfile.arm64v8 @@ -88,5 +88,5 @@ RUN \ EXPOSE $PORT USER wekan -CMD ["bash", "-c", "ulimit -s 65500; exec node /home/wekan/bundle/main.js"] +CMD ["bash", "-c", "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 /home/wekan/bundle/main.js"] diff --git a/releases/virtualbox/start-wekan.sh b/releases/virtualbox/start-wekan.sh index 09ec12765..ee0ca3265 100755 --- a/releases/virtualbox/start-wekan.sh +++ b/releases/virtualbox/start-wekan.sh @@ -411,6 +411,6 @@ #export WAIT_SPINNER=Bounce #--------------------------------------------------------------------- - node main.js & >> ~/repos/wekan.log + node --stack-size=65500 --max-old-space-size=8192 main.js & >> ~/repos/wekan.log cd ~/repos #done diff --git a/snap-src/bin/wekan-control b/snap-src/bin/wekan-control index e4260851d..900a81b2f 100755 --- a/snap-src/bin/wekan-control +++ b/snap-src/bin/wekan-control @@ -36,4 +36,4 @@ cd $APPLICATION_DIRECTORY # bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" #--------------------------------------------------------------------- #bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 $APPLICATION_START" -bash -c "ulimit -s 65500; exec $NODE_PATH/node $APPLICATION_START" +bash -c "ulimit -s 65500; exec $NODE_PATH/node --stack-size=65500 --max-old-space-size=8192 $APPLICATION_START" diff --git a/stacksmith/user-scripts/run.sh b/stacksmith/user-scripts/run.sh index 1e9d3b460..84741eabc 100755 --- a/stacksmith/user-scripts/run.sh +++ b/stacksmith/user-scripts/run.sh @@ -20,9 +20,9 @@ echo "starting the wekan service..." #--------------------------------------------------------------------- # https://github.com/wekan/wekan/issues/3585#issuecomment-1021522132 # Add more Node heap: -export NODE_OPTIONS="--max_old_space_size=4096" +#export NODE_OPTIONS="--max_old_space_size=4096" # Add more stack: #bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" -bash -c "ulimit -s 65500; exec node main.js" +bash -c "ulimit -s 65500; exec --stack-size=65500 --max-old-space-size=8192 node main.js" #--------------------------------------------------------------------- #node main.js diff --git a/start-wekan.sh b/start-wekan.sh index c51c8ff45..8f5210385 100755 --- a/start-wekan.sh +++ b/start-wekan.sh @@ -555,7 +555,7 @@ #bash -c "ulimit -s 65500; exec node --stack-size=65500 --trace-deprecation main.js" #bash -c "ulimit -s 65500; exec node --stack-size=65500 main.js" #-------------------- OPTIONAL SETTINGS END ---------------------- - bash -c "ulimit -s 65500; exec node main.js" + bash -c "ulimit -s 65500; exec node --stack-size=65500 --max-old-space-size=8192 main.js" #node main.js #--------------------------------------------------------------------- # & >> ../../wekan.log From 75ca4920c5ff2a6db31136a98f4d4c58b6eee418 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:36:10 +0200 Subject: [PATCH 6/8] Updated ChangeLog. --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68d796e5e..64ca59e77 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,11 @@ This release adds the following updates: - [Updated dependencies](https://github.com/wekan/wekan/commit/b24acefa6f6696b702f2c3ceb28d6d6290017bb2). Thanks to developers of dependencies. +and fixes the following bugs: + +- [Add more stack size](https://github.com/wekan/wekan/commit/324be07b859937966f98feb2aeea8f344c689bb0). + Thanks to xet7. + Thanks to above GitHub users for their contributions and translators for their translations. # v7.61 2024-10-23 WeKan ® release From a27f8ecfa9971740a019a955d3f8d0e5a5dd8dab Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:55:33 +0200 Subject: [PATCH 7/8] Fix Warning: missing space before text for line 210 of jade file client/components/activities/activities.jade Thanks to xet7 ! --- client/components/activities/activities.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/components/activities/activities.jade b/client/components/activities/activities.jade index 0c3c175b8..f725ff1c8 100644 --- a/client/components/activities/activities.jade +++ b/client/components/activities/activities.jade @@ -207,7 +207,7 @@ template(name="activity") | {{_ 'activity-archived' (sanitize listLabel)}}. if($eq activity.activityType 'changedListTitle') - {{_ 'activity-changedListTitle' (sanitize listLabel) boardLabelLink}} + | {{_ 'activity-changedListTitle' (sanitize listLabel) boardLabelLink}} //- member activity ---------------------------------------------------- if($eq activity.activityType 'joinMember') From 89347abf53af86a1cb58ab249b1051f0f9046db6 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 2 Nov 2024 18:56:52 +0200 Subject: [PATCH 8/8] Updated ChangeLog. --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64ca59e77..27ff54e32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,6 +36,8 @@ and fixes the following bugs: - [Add more stack size](https://github.com/wekan/wekan/commit/324be07b859937966f98feb2aeea8f344c689bb0). Thanks to xet7. +- [Fix Warning: missing space before text for line 210 of jade file client/components/activities/activities.jade](https://github.com/wekan/wekan/commit/a27f8ecfa9971740a019a955d3f8d0e5a5dd8dab). + Thanks to xet7. Thanks to above GitHub users for their contributions and translators for their translations.