Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2

# Conflicts:
#	package-lock.json
#	package.json
#	server/model/monitor.js
#	server/monitor-types/tailscale-ping.js
#	server/socket-handlers/general-socket-handler.js
#	server/uptime-kuma-server.js

server/util-server.js

@@ -461,6 +461,7 @@ exports.postgresQuery = function (connectionString, query) {
                     });
                 } catch (e) {
                     reject(e);
+                    client.end();
                 }
             }
         });
@@ -1154,7 +1155,6 @@ module.exports.axiosAbortSignal = (timeoutMs) => {
         // v16-: AbortSignal.timeout is not supported
         try {
             const abortController = new AbortController();
-
             setTimeout(() => abortController.abort(), timeoutMs);
 
             return abortController.signal;