aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/commands/destroy.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-10-15 17:36:54 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2009-10-15 17:36:54 -0700
commit71f7e75d95c47e4283a7cac0a2f776abf0a11d0e (patch)
tree75a9b6825f9f81a9bec372af8db097b6ea022fc6 /railties/lib/rails/commands/destroy.rb
parent2d7abe245e7a2b1717e48ef550e4083318fd7ec2 (diff)
parentef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff)
downloadrails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.gz
rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.bz2
rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.zip
Merge branch 'master' into orchestra
Diffstat (limited to 'railties/lib/rails/commands/destroy.rb')
-rw-r--r--railties/lib/rails/commands/destroy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/commands/destroy.rb b/railties/lib/rails/commands/destroy.rb
index 5013d30b83..860c03e01e 100644
--- a/railties/lib/rails/commands/destroy.rb
+++ b/railties/lib/rails/commands/destroy.rb
@@ -1,5 +1,5 @@
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'generators'))
-require "#{RAILS_ROOT}/config/environment"
+require "#{RAILS_ROOT}/config/application"
if ARGV.size == 0
Rails::Generators.help