Merge pull request 'user merging should only be done by admins' (#1183 ) from user-upd into main

Reviewed-on: #1183
Merge pull request 'show all users on ranking board; be able to merge users' (#1181 ) from user-upd into main
2026-01-08 20:23:22 +01:00 · 2026-01-08 20:16:42 +01:00
2 changed files with 738 additions and 682 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -23,11 +23,11 @@ tera =  { version = "1.20", features = ["date-locale"], optional = true}
 ics = "0.5"
 futures = "0.3"
 lettre = "0.11"
-csv = "1.4"
+csv = "1.3"
 itertools = "0.14"
-job_scheduler_ng = "2.4"
-ureq = { version = "3.1", features = ["json"] }
-regex = "1.12"
+job_scheduler_ng = "2.2"
+ureq = { version = "3.0", features = ["json"] }
+regex = "1.11"
 urlencoding = "2.1"

 [target.'cfg(not(windows))'.dependencies]
Author	SHA1	Message	Date
philipp	6d36d01c2f	Merge pull request 'user merging should only be done by admins' (#1183 ) from user-upd into main All checks were successful CI/CD Pipeline / test (push) Successful in 20m19s Details CI/CD Pipeline / deploy-staging (push) Has been skipped Details CI/CD Pipeline / deploy-main (push) Successful in 9m49s Details Reviewed-on: #1183	2026-01-08 20:23:22 +01:00
philipp	13de487b10	Merge pull request 'show all users on ranking board; be able to merge users' (#1181 ) from user-upd into main Some checks failed CI/CD Pipeline / test (push) Has been cancelled Details CI/CD Pipeline / deploy-staging (push) Has been cancelled Details CI/CD Pipeline / deploy-main (push) Has been cancelled Details Reviewed-on: #1181	2026-01-08 20:16:42 +01:00