diff options
| author | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-27 22:27:33 -0800 |
|---|---|---|
| committer | Yehuda Katz <wycats@Yehuda-Katz.local> | 2009-12-27 22:27:33 -0800 |
| commit | 9abbe9f0b311418b19e9c036e9b67c84a6bf2b7c (patch) | |
| tree | 7138b35958a419eb4f93486547b0bed2d8b34ec1 /railties | |
| parent | 99f7e0ff276c69c8503ea8b26c4417bd91116260 (diff) | |
| parent | 1c47d04ea5ac19601b316daf8fdc6f38c50eec73 (diff) | |
| download | rails-9abbe9f0b311418b19e9c036e9b67c84a6bf2b7c.tar.gz rails-9abbe9f0b311418b19e9c036e9b67c84a6bf2b7c.tar.bz2 rails-9abbe9f0b311418b19e9c036e9b67c84a6bf2b7c.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/app_generator.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/gitignore | 3 |
3 files changed, 6 insertions, 0 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 9ef2922133..0bc1ea32bc 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *Edge* +* Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) [DHH] + * Added cookies.permanent, cookies.signed, and cookies.permanent.signed accessor for common cookie actions [DHH]. Examples: cookies.permanent[:prefers_open_id] = true diff --git a/railties/lib/rails/generators/rails/app/app_generator.rb b/railties/lib/rails/generators/rails/app/app_generator.rb index 30272ed9b2..ef5399e48f 100644 --- a/railties/lib/rails/generators/rails/app/app_generator.rb +++ b/railties/lib/rails/generators/rails/app/app_generator.rb @@ -49,6 +49,7 @@ module Rails::Generators def create_root_files copy_file "README" + copy_file "gitignore", ".gitignore" template "Rakefile" template "config.ru" template "Gemfile" diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore new file mode 100644 index 0000000000..a4f05d101d --- /dev/null +++ b/railties/lib/rails/generators/rails/app/templates/gitignore @@ -0,0 +1,3 @@ +db/*.sqlite3 +log/*.log +tmp/**/* |