aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2012-12-26 13:02:59 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2012-12-26 13:02:59 +0100
commit61b91c4c55bcbd5a2ec85d6e1c67755150653dff (patch)
treee290a5d3ae8b5bb4bdff85bf6549f8464e8cc7b9 /railties
parent227d4e9bdd445f936ff2a2752b4e42d401b6e3cb (diff)
downloadrails-61b91c4c55bcbd5a2ec85d6e1c67755150653dff.tar.gz
rails-61b91c4c55bcbd5a2ec85d6e1c67755150653dff.tar.bz2
rails-61b91c4c55bcbd5a2ec85d6e1c67755150653dff.zip
Revert "Ignore /bin on new apps" -- given the move to default binstubs, we want you to check those in!
This reverts commit 35c554f0bf518e1068e79002a462c3deba649e9b.
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/gitignore7
1 files changed, 3 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/gitignore b/railties/lib/rails/generators/rails/app/templates/gitignore
index 090799d5a0..52abb32479 100644
--- a/railties/lib/rails/generators/rails/app/templates/gitignore
+++ b/railties/lib/rails/generators/rails/app/templates/gitignore
@@ -4,14 +4,13 @@
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'
-# Ignore bundler related files
+# Ignore bundler config
/.bundle
-/bin
-# Ignore the default SQLite database
+# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal
-# Ignore all logfiles and tempfiles
+# Ignore all logfiles and tempfiles.
/log/*.log
/tmp