Merge branch 'dev' into materialized_views

This commit is contained in:
Dessalines 2020-01-13 21:33:15 -05:00
commit 6260fea707

3
ui/package.json vendored
View file

@ -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": [