Merge branch 'master' into change-job-queue-status-from-cli

loco-rs · Feb 14, 2025 · 2ce70c2 · 2ce70c2
2 parents b6649ec + 1b58868
commit 2ce70c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,9 @@
 * flatten (de)serialization of custom user claims. [https://github.com/loco-rs/loco/pull/1159](https://github.com/loco-rs/loco/pull/1159)
 * Updated validator to 0.20. [https://github.com/loco-rs/loco/pull/1199](https://github.com/loco-rs/loco/pull/1199)
 * Scaffold v2. [https://github.com/loco-rs/loco/pull/1209](https://github.com/loco-rs/loco/pull/1209)
+* Fix generator Docker deployment to support both server-side and client-side rendering. [https://github.com/loco-rs/loco/pull/1227](https://github.com/loco-rs/loco/pull/1227)
+* document num_workers worker configuration. [https://github.com/loco-rs/loco/pull/1242](https://github.com/loco-rs/loco/pull/1242)
+* smoother model validations. [https://github.com/loco-rs/loco/pull/1233](https://github.com/loco-rs/loco/pull/1233)
 
 
 ## v0.14.1

diff --git a/docs-site/content/docs/resources/faq.md b/docs-site/content/docs/resources/faq.md
@@ -17,10 +17,10 @@ flair =[]
 <details>
 <summary>How can I automatically reload code?</summary>
 
-Try [cargo watch](https://crates.io/crates/cargo-watch):
+Try [cargo watchexec](https://crates.io/crates/watchexec):
 
 ```
-$ cargo-watch -x check  -s 'cargo loco start'
+$ watchexec --notify -r -- cargo loco start
 ```
 
 Or [bacon](https://github.com/Canop/bacon)

diff --git a/loco-new/base_template/.gitignore b/loco-new/base_template/.gitignore
@@ -16,4 +16,5 @@ target/
 # MSVC Windows builds of rustc generate these, which store debugging information
 *.pdb
 
-*.sqlite
+*.sqlite
+*.sqlite-*