aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 17:48:11 -0800
committerDavid Heinemeier Hansson <david@loudthinking.com>2009-12-27 17:48:11 -0800
commita642edbef31fe96fad488accf0052653c573e8db (patch)
tree78286e732f8b4bea05621db0c33d8417fc6169e2
parentf095e6f59dacb9156a71889e8acbe9be8bdc1582 (diff)
downloadrails-a642edbef31fe96fad488accf0052653c573e8db.tar.gz
rails-a642edbef31fe96fad488accf0052653c573e8db.tar.bz2
rails-a642edbef31fe96fad488accf0052653c573e8db.zip
Added default .gitignore (this is just recognizing Git market share, don't throw a hissy if you use another SCM) [DHH]
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/lib/rails/generators/rails/app/app_generator.rb1
-rw-r--r--railties/lib/rails/generators/rails/app/templates/gitignore3
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/**/*