Skip to content

Commit 8dfcb7e

Browse files
committed
Merge remote-tracking branch 'upstream/pr/612'
2 parents eaf921b + ec5aef5 commit 8dfcb7e

File tree

4 files changed

+106
-143
lines changed

4 files changed

+106
-143
lines changed

Cargo.lock

Lines changed: 75 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ git2 = "0.6.4"
2323
flate2 = "0.2"
2424
semver = "0.5"
2525
url = "1.2.1"
26-
postgres = { version = "0.13", features = ["with-time", "with-openssl", "with-rustc-serialize"] }
26+
postgres = { version = "0.14.0", features = ["with-time", "with-openssl", "with-serde_json"] }
2727
r2d2 = "0.7.0"
28-
r2d2_postgres = "0.11"
28+
r2d2_postgres = "0.12.0"
2929
openssl = "0.9"
3030
curl = "0.4"
3131
oauth2 = "0.3"
@@ -39,7 +39,9 @@ diesel = { version = "0.11.0", features = ["postgres", "serde_json", "deprecated
3939
diesel_codegen = { version = "0.11.0", features = ["postgres"] }
4040
r2d2-diesel = "0.11.0"
4141
diesel_full_text_search = "0.11.0"
42-
serde_json = "0.9.0"
42+
serde_json = "0.9.9"
43+
serde_derive = "0.9.11"
44+
serde = "0.9.11"
4345

4446
conduit = "0.8"
4547
conduit-conditional-get = "0.8"

0 commit comments

Comments
 (0)