aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/generators/rails
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-12 20:40:34 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-12 20:40:34 +0100
commit2b0611b9bb3259859b4776e672e5ef93a8b08620 (patch)
treeb9f8bf73f6bffa0246ed32346576c4b76563cc21 /railties/lib/generators/rails
parentf2c0a353aef41a6df2de8e1fe3eaa3d8bbd8a6dd (diff)
downloadrails-2b0611b9bb3259859b4776e672e5ef93a8b08620.tar.gz
rails-2b0611b9bb3259859b4776e672e5ef93a8b08620.tar.bz2
rails-2b0611b9bb3259859b4776e672e5ef93a8b08620.zip
Revert "Always load the environment before executing any command. [#3905 status:resolved]"
This reverts commit 16846553b8866eab2aa3b128a2a23a221a25f7e3.
Diffstat (limited to 'railties/lib/generators/rails')
-rw-r--r--railties/lib/generators/rails/app/templates/script/rails7
1 files changed, 5 insertions, 2 deletions
diff --git a/railties/lib/generators/rails/app/templates/script/rails b/railties/lib/generators/rails/app/templates/script/rails
index 199fe1a6d3..b01d1ee183 100644
--- a/railties/lib/generators/rails/app/templates/script/rails
+++ b/railties/lib/generators/rails/app/templates/script/rails
@@ -1,5 +1,8 @@
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-ENV_PATH = File.expand_path('../../config/environment', __FILE__)
-require File.expand_path('../../config/boot', __FILE__)
+ENV_PATH = File.expand_path('../../config/environment', __FILE__)
+BOOT_PATH = File.expand_path('../../config/boot', __FILE__)
+APP_PATH = File.expand_path('../../config/application', __FILE__)
+
+require BOOT_PATH
require 'rails/commands'