diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-21 09:09:00 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-21 09:10:47 +0100 |
| commit | 36fe7f3bed8fa6fd19156a90633a42e4e2d10cfa (patch) | |
| tree | 1601393b4f965ee073d60af298d26a083da61910 /railties | |
| parent | 3e92806357543cdbabad813884a591fca69193c2 (diff) | |
| parent | f245fe856d424cfce623f45d346f5618e1ed0840 (diff) | |
| download | rails-36fe7f3bed8fa6fd19156a90633a42e4e2d10cfa.tar.gz rails-36fe7f3bed8fa6fd19156a90633a42e4e2d10cfa.tar.bz2 rails-36fe7f3bed8fa6fd19156a90633a42e4e2d10cfa.zip | |
Merge pull request #17700 from ShunsukeAida/ignore_log_as_a_whole
why not gitignore /log as a whole?
[ci skip]
Diffstat (limited to 'railties')
| -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 |