Merge branch 'LemmyNet:main' into master

dockur · Sep 19, 2024 · e293b5c · e293b5c
2 parents ebb86a8 + 5a72214
commit e293b5c
Show file tree

Hide file tree

Showing 95 changed files with 2,431 additions and 1,171 deletions.
diff --git a/.woodpecker.yml b/.woodpecker.yml
@@ -2,7 +2,7 @@
 # See https://github.com/woodpecker-ci/woodpecker/issues/1677
 
 variables:
-  - &rust_image "rust:1.80"
+  - &rust_image "rust:1.81"
   - &rust_nightly_image "rustlang/rust:nightly"
   - &install_pnpm "corepack enable pnpm"
   - &install_binstall "wget -O- https://github.com/cargo-bins/cargo-binstall/releases/latest/download/cargo-binstall-x86_64-unknown-linux-musl.tgz | tar -xvz -C /usr/local/cargo/bin"

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/api_tests/package.json b/api_tests/package.json
@@ -27,7 +27,7 @@
     "eslint": "^9.8.0",
     "eslint-plugin-prettier": "^5.1.3",
     "jest": "^29.5.0",
-    "lemmy-js-client": "0.19.5-alpha.1",
+    "lemmy-js-client": "0.20.0-alpha.4",
     "prettier": "^3.2.5",
     "ts-jest": "^29.1.0",
     "typescript": "^5.5.4",