Merge branch 'main' into woodpecker_rust_1.75

This commit is contained in:
Dessalines 2024-01-09 11:45:48 -05:00
commit 1f85f857c8
3 changed files with 25 additions and 25 deletions

24
Cargo.lock generated
View file

@ -2529,7 +2529,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "lemmy_api" name = "lemmy_api"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2558,7 +2558,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_common" name = "lemmy_api_common"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2593,7 +2593,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_crud" name = "lemmy_api_crud"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2615,7 +2615,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_apub" name = "lemmy_apub"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2655,7 +2655,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_schema" name = "lemmy_db_schema"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"async-trait", "async-trait",
@ -2692,7 +2692,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views" name = "lemmy_db_views"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"chrono", "chrono",
@ -2712,7 +2712,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_actor" name = "lemmy_db_views_actor"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"chrono", "chrono",
"diesel", "diesel",
@ -2730,7 +2730,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_moderator" name = "lemmy_db_views_moderator"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"diesel", "diesel",
"diesel-async", "diesel-async",
@ -2742,7 +2742,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_federate" name = "lemmy_federate"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"anyhow", "anyhow",
@ -2765,7 +2765,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_routes" name = "lemmy_routes"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2789,7 +2789,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_server" name = "lemmy_server"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-cors", "actix-cors",
@ -2832,7 +2832,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_utils" name = "lemmy_utils"
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"anyhow", "anyhow",

View file

@ -1,5 +1,5 @@
[workspace.package] [workspace.package]
version = "0.19.2-rc.3.publish4" version = "0.19.2-rc.4"
publish = false publish = false
edition = "2021" edition = "2021"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
@ -85,16 +85,16 @@ unused_self = "deny"
unwrap_used = "deny" unwrap_used = "deny"
[workspace.dependencies] [workspace.dependencies]
lemmy_api = { version = "=0.19.2-rc.3.publish4", path = "./crates/api" } lemmy_api = { version = "=0.19.2-rc.4", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.2-rc.3.publish4", path = "./crates/api_crud" } lemmy_api_crud = { version = "=0.19.2-rc.4", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.2-rc.3.publish4", path = "./crates/apub" } lemmy_apub = { version = "=0.19.2-rc.4", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.2-rc.3.publish4", path = "./crates/utils" } lemmy_utils = { version = "=0.19.2-rc.4", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.19.2-rc.3.publish4", path = "./crates/db_schema" } lemmy_db_schema = { version = "=0.19.2-rc.4", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.2-rc.3.publish4", path = "./crates/api_common" } lemmy_api_common = { version = "=0.19.2-rc.4", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.2-rc.3.publish4", path = "./crates/routes" } lemmy_routes = { version = "=0.19.2-rc.4", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.2-rc.3.publish4", path = "./crates/db_views" } lemmy_db_views = { version = "=0.19.2-rc.4", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.2-rc.3.publish4", path = "./crates/db_views_actor" } lemmy_db_views_actor = { version = "=0.19.2-rc.4", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.2-rc.3.publish4", path = "./crates/db_views_moderator" } lemmy_db_views_moderator = { version = "=0.19.2-rc.4", path = "./crates/db_views_moderator" }
activitypub_federation = { version = "0.5.1-beta.1", default-features = false, features = [ activitypub_federation = { version = "0.5.1-beta.1", default-features = false, features = [
"actix-web", "actix-web",
] } ] }
@ -166,7 +166,7 @@ lemmy_utils = { workspace = true }
lemmy_db_schema = { workspace = true } lemmy_db_schema = { workspace = true }
lemmy_api_common = { workspace = true } lemmy_api_common = { workspace = true }
lemmy_routes = { workspace = true } lemmy_routes = { workspace = true }
lemmy_federate = { version = "0.19.2-rc.3.publish4", path = "crates/federate" } lemmy_federate = { version = "0.19.2-rc.4", path = "crates/federate" }
activitypub_federation = { workspace = true } activitypub_federation = { workspace = true }
diesel = { workspace = true } diesel = { workspace = true }
diesel-async = { workspace = true } diesel-async = { workspace = true }

@ -1 +1 @@
Subproject commit 06a610696af829248954e411ebe2cf3906092244 Subproject commit 2139975ef383077e4709a4f2cae42922fd63b860