aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-03 18:49:47 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-03 18:49:47 +0100
commitefa850558facf2fbaaf226f1444802da83924b82 (patch)
tree236380296b0d0f54f5d2e6d8523930d72e9ff645 /railties/lib/generators/rails
parent391f2543c96a9b3de4e44f4ea6aeee2f53ad9e5c (diff)
downloadrails-efa850558facf2fbaaf226f1444802da83924b82.tar.gz
rails-efa850558facf2fbaaf226f1444802da83924b82.tar.bz2
rails-efa850558facf2fbaaf226f1444802da83924b82.zip
Make bin/rails call rails/commands/application, fix generators usage and update .gitignores.
Diffstat (limited to 'railties/lib/generators/rails')
-rw-r--r--railties/lib/generators/rails/app/templates/gitignore1
-rw-r--r--railties/lib/generators/rails/app/templates/script/rails2
2 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/generators/rails/app/templates/gitignore b/railties/lib/generators/rails/app/templates/gitignore
index a4f05d101d..af64fae5e7 100644
--- a/railties/lib/generators/rails/app/templates/gitignore
+++ b/railties/lib/generators/rails/app/templates/gitignore
@@ -1,3 +1,4 @@
+.bundle
db/*.sqlite3
log/*.log
tmp/**/*
diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/generators/rails/app/templates/script/rails
index c23d24b30b..2fcf6d09b5 100644
--- a/railties/lib/generators/rails/app/templates/script/rails
+++ b/railties/lib/generators/rails/app/templates/script/rails
@@ -6,4 +6,4 @@ APP_PATH = File.expand_path('../../config/application', __FILE__)
ROOT_PATH = File.expand_path('../..', __FILE__)
require BOOT_PATH
-require 'rails/commands/rails'
+require 'rails/commands'