Merge branch 'dev' into materialized_views

2020-01-13 21:33:15 -05:00 · 2020-01-13 21:33:15 -05:00 · 6260fea707
parent a06476fa96 083fcb9c6c
commit 6260fea707
1 changed files with 2 additions and 1 deletions
--- a/ui/package.json
+++ b/ui/package.json
@ -57,7 +57,7 @@
  "engineStrict": true,
  "husky": {
    "hooks": {
-      "pre-commit": "cargo fmt --manifest-path ../server/Cargo.toml && cargo clippy --manifest-path ../server/Cargo.toml --all-targets --all-features -- -D warnings && lint-staged"
+      "pre-commit": "cargo clippy --manifest-path ../server/Cargo.toml --all-targets --all-features -- -D warnings && lint-staged"
    }
  },
  "lint-staged": {
@ -67,6 +67,7 @@
      "git add"
    ],
    "../server/src/**/*.rs": [
+      "rustfmt --config-path ../server/.rustfmt.toml",
      "git add"
    ],
    "package.json": [