gsathecat
/
lemmy
mirror of https://github.com/LemmyNet/lemmy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into materialized_views

pull/418/head
Dessalines 2020-01-13 21:33:15 -05:00
parent a06476fa96 083fcb9c6c
commit 6260fea707
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ui/package.json vendored
View File

@ -57,7 +57,7 @@
"engineStrict": true, "engineStrict": true,
"husky": { "husky": {
"hooks": { "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": { "lint-staged": {
@ -67,6 +67,7 @@
"git add" "git add"
], ],
"../server/src/**/*.rs": [ "../server/src/**/*.rs": [
"rustfmt --config-path ../server/.rustfmt.toml",
"git add" "git add"
], ],
"package.json": [ "package.json": [