Skip to content

Commit

Permalink
Merge pull request 'Update crates' (Plume-org#1115) from update-rocke…
Browse files Browse the repository at this point in the history
…t_csrf into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/1115
  • Loading branch information
KitaitiMakoto committed Jan 1, 2023
2 parents 620726c + 263cf9e commit 63d2cf9
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 26 deletions.
41 changes: 25 additions & 16 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ rocket = "0.4.11"
rocket_contrib = { version = "0.4.11", features = ["json"] }
rocket_i18n = "0.4.1"
scheduled-thread-pool = "0.2.6"
serde = "1.0"
serde = "=1.0.137"
serde_json = "1.0.81"
shrinkwraprs = "0.3.0"
validator = { version = "0.15", features = ["derive"] }
webfinger = "0.4.1"
tracing = "0.1.35"
tracing-subscriber = "0.3.10"
riker = "0.4.2"
activitystreams = "0.7.0-alpha.18"
activitystreams = "=0.7.0-alpha.20"

[[bin]]
name = "plume"
Expand Down Expand Up @@ -60,8 +60,8 @@ path = "plume-common"
path = "plume-models"

[dependencies.rocket_csrf]
git = "https://github.com/fdb-hiroshima/rocket_csrf"
rev = "29910f2829e7e590a540da3804336577b48c7b31"
git = "https://git.joinplu.me/plume/rocket_csrf"
rev = "0.1.1"

[build-dependencies]
ructe = "0.14.0"
Expand Down
2 changes: 1 addition & 1 deletion plume-api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ authors = ["Plume contributors"]
edition = "2018"

[dependencies]
serde = "1.0"
serde = "=1.0.137"
serde_derive = "1.0"
4 changes: 2 additions & 2 deletions plume-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ hex = "0.4"
openssl = "0.10.40"
rocket = "0.4.11"
reqwest = { version = "0.11.11", features = ["blocking", "json", "socks"] }
serde = "1.0"
serde = "=1.0.137"
serde_derive = "1.0"
serde_json = "1.0.81"
shrinkwraprs = "0.3.0"
syntect = "4.5.0"
regex-syntax = { version = "0.6.26", default-features = false, features = ["unicode-perl"] }
tracing = "0.1.35"
askama_escape = "0.10.3"
activitystreams = "0.7.0-alpha.18"
activitystreams = "=0.7.0-alpha.20"
activitystreams-ext = "0.1.0-alpha.2"
url = "2.2.2"
flume = "0.10.13"
Expand Down
2 changes: 1 addition & 1 deletion plume-front/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ gettext = "0.4.0"
gettext-macros = "0.6.1"
gettext-utils = "0.1.0"
lazy_static = "1.3"
serde = "1.0"
serde = "=1.0.137"
serde_json = "1.0"
wasm-bindgen = "0.2.81"
js-sys = "0.3.58"
Expand Down
4 changes: 2 additions & 2 deletions plume-models/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ rocket = "0.4.11"
rocket_i18n = "0.4.1"
reqwest = "0.11.11"
scheduled-thread-pool = "0.2.6"
serde = "1.0"
serde = "=1.0.137"
serde_derive = "1.0"
serde_json = "1.0.81"
tantivy = "0.13.3"
Expand All @@ -34,7 +34,7 @@ riker = "0.4.2"
once_cell = "1.12.0"
lettre = "0.9.6"
native-tls = "0.2.10"
activitystreams = "0.7.0-alpha.18"
activitystreams = "=0.7.0-alpha.20"

[dependencies.chrono]
features = ["serde"]
Expand Down

0 comments on commit 63d2cf9

Please sign in to comment.