diff options
| -rw-r--r-- | railties/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index f267be5eb8..a1c7587f4d 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -1,3 +1,8 @@ +* Generated `.gitignore` excludes the whole `log/` directory, not only + `*.log` files. + + *ShunsukeAida* + * `Rails::Paths::Path.unshift` now has the same interface as `Array.unshift`. *Igor Kapkov* diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore index 8775e5e235..ee61b7c5a8 100644 --- a/railties/lib/rails/generators/rails/app/templates/gitignore +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -14,5 +14,5 @@ <% end -%> # Ignore all logfiles and tempfiles. -/log/*.log +/log /tmp |