From 223cde831f09a49a317bc4e5926cc8a38a6fa3f2 Mon Sep 17 00:00:00 2001 From: Louis Lam Date: Sat, 18 Jan 2025 23:35:40 +0800 Subject: [PATCH 1/2] Fix push examples cannot be loaded (Docker only) (#5490) --- .dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index 5db08b7bf..77470feb1 100644 --- a/.dockerignore +++ b/.dockerignore @@ -32,7 +32,6 @@ tsconfig.json /extra/healthcheck.exe /extra/healthcheck /extra/exe-builder -/extra/push-examples /extra/uptime-kuma-push # Comment the following line if you want to rebuild the healthcheck binary From 03beef800652be3508ef641867cde75d7f3c8ee4 Mon Sep 17 00:00:00 2001 From: DayShift <113507098+ShiyuBanzhou@users.noreply.github.com> Date: Thu, 23 Jan 2025 02:03:38 +0800 Subject: [PATCH 2/2] BugFix:Regular Expression in parseDuration Function (#5563) Co-authored-by: Frank Elsinga --- server/modules/apicache/apicache.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/modules/apicache/apicache.js b/server/modules/apicache/apicache.js index 41930b24d..95a04d9e3 100644 --- a/server/modules/apicache/apicache.js +++ b/server/modules/apicache/apicache.js @@ -485,7 +485,7 @@ function ApiCache() { } if (typeof duration === "string") { - let split = duration.match(/^([\d\.,]+)\s?(\w+)$/); + let split = duration.match(/^([\d\.,]+)\s?([a-zA-Z]+)$/); if (split.length === 3) { let len = parseFloat(split[1]);