LemmyNet/lemmy
2
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2024-11-23 12:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/main' into thumbnail_sizes

Browse source
This commit is contained in:
Dessalines 2024-06-17 14:28:35 -04:00
commit e5e5e785ff
4 changed files with 30 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Cargo.lock generated
View file

@ -2871,7 +2871,7 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
[[package]]
name = "lemmy_api"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2900,7 +2900,7 @@ dependencies = [
[[package]]
name = "lemmy_api_common"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2938,7 +2938,7 @@ dependencies = [
[[package]]
name = "lemmy_api_crud"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"accept-language",
"activitypub_federation",
@ -2961,7 +2961,7 @@ dependencies = [
[[package]]
name = "lemmy_apub"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"actix-web",
@ -2999,7 +2999,7 @@ dependencies = [
[[package]]
name = "lemmy_db_perf"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"anyhow",
"clap",
@ -3014,7 +3014,7 @@ dependencies = [
[[package]]
name = "lemmy_db_schema"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"anyhow",
@ -3055,7 +3055,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"actix-web",
"chrono",
@ -3077,7 +3077,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_actor"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"chrono",
"diesel",
@ -3098,7 +3098,7 @@ dependencies = [
[[package]]
name = "lemmy_db_views_moderator"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"diesel",
"diesel-async",
@ -3110,7 +3110,7 @@ dependencies = [
[[package]]
name = "lemmy_federate"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"anyhow",
@ -3135,7 +3135,7 @@ dependencies = [
[[package]]
name = "lemmy_routes"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"actix-web",
@ -3160,7 +3160,7 @@ dependencies = [
[[package]]
name = "lemmy_server"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"activitypub_federation",
"actix-cors",
@ -3203,7 +3203,7 @@ dependencies = [
[[package]]
name = "lemmy_utils"
version = "0.19.4"
version = "0.19.5-alpha.1"
dependencies = [
"actix-web",
"anyhow",

24
Cargo.toml
View file

@ -1,5 +1,5 @@
[workspace.package]
version = "0.19.4"
version = "0.19.5-alpha.1"
edition = "2021"
description = "A link aggregator for the fediverse"
license = "AGPL-3.0"
@ -88,17 +88,17 @@ unused_self = "deny"
unwrap_used = "deny"
[workspace.dependencies]
lemmy_api = { version = "=0.19.4", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.4", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.4", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.4", path = "./crates/utils", default-features = false }
lemmy_db_schema = { version = "=0.19.4", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.4", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.4", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.4", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.4", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.4", path = "./crates/db_views_moderator" }
lemmy_federate = { version = "=0.19.4", path = "./crates/federate" }
lemmy_api = { version = "=0.19.5-alpha.1", path = "./crates/api" }
lemmy_api_crud = { version = "=0.19.5-alpha.1", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.19.5-alpha.1", path = "./crates/apub" }
lemmy_utils = { version = "=0.19.5-alpha.1", path = "./crates/utils", default-features = false }
lemmy_db_schema = { version = "=0.19.5-alpha.1", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.19.5-alpha.1", path = "./crates/api_common" }
lemmy_routes = { version = "=0.19.5-alpha.1", path = "./crates/routes" }
lemmy_db_views = { version = "=0.19.5-alpha.1", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.19.5-alpha.1", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.19.5-alpha.1", path = "./crates/db_views_moderator" }
lemmy_federate = { version = "=0.19.5-alpha.1", path = "./crates/federate" }
activitypub_federation = { version = "0.5.6", default-features = false, features = [
"actix-web",
] }

8
api_tests/pnpm-lock.yaml
View file

@ -40,7 +40,7 @@ importers:
version: 3.3.2
ts-jest:
specifier: ^29.1.0
version: 29.1.4(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5)
version: 29.1.5(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5)
typescript:
specifier: ^5.4.4
version: 5.4.5
@ -1512,8 +1512,8 @@ packages:
peerDependencies:
typescript: '>=4.2.0'
ts-jest@29.1.4:
resolution: {integrity: sha512-YiHwDhSvCiItoAgsKtoLFCuakDzDsJ1DLDnSouTaTmdOcOwIkSzbLXduaQ6M5DRVhuZC/NYaaZ/mtHbWMv/S6Q==}
ts-jest@29.1.5:
resolution: {integrity: sha512-UuClSYxM7byvvYfyWdFI+/2UxMmwNyJb0NPkZPQE2hew3RurV7l7zURgOHAd/1I1ZdPpe3GUsXNXAcN8TFKSIg==}
engines: {node: ^14.15.0 || ^16.10.0 || ^18.0.0 || >=20.0.0}
hasBin: true
peerDependencies:
@ -3372,7 +3372,7 @@ snapshots:
dependencies:
typescript: 5.4.5
ts-jest@29.1.4(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5):
ts-jest@29.1.5(@babel/core@7.23.9)(@jest/transform@29.7.0)(@jest/types@29.6.3)(babel-jest@29.7.0(@babel/core@7.23.9))(jest@29.7.0(@types/node@20.14.2))(typescript@5.4.5):
dependencies:
bs-logger: 0.2.6
fast-json-stable-stringify: 2.1.0

2
crates/utils/translations

@ -1 +1 @@
Subproject commit b3bdd9cf78a234438dcc7ccb904739280eda5915
Subproject commit c3594b4fc024c2ac6a8dab7a97fda5350a5d77e1