diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-08 21:13:29 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2005-07-08 21:13:29 +0000 |
commit | 17041729c20f4735b9d174c9d2de24dad79db742 (patch) | |
tree | 9a69dae346df28cb3237a6441baff8dd827284d6 /railties/environments/environment.rb | |
parent | 2c8ebe468477e75e4808ffc9fa5aa28112aa9ec6 (diff) | |
download | rails-17041729c20f4735b9d174c9d2de24dad79db742.tar.gz rails-17041729c20f4735b9d174c9d2de24dad79db742.tar.bz2 rails-17041729c20f4735b9d174c9d2de24dad79db742.zip |
r2951@asus: jeremy | 2005-07-08 18:09:30 -0700
Courtenay documentation and error message patches.
r2952@asus: jeremy | 2005-07-08 18:43:10 -0700
Document environment config files.
r2955@asus: jeremy | 2005-07-08 19:00:26 -0700
Updated changelog
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1775 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments/environment.rb')
-rw-r--r-- | railties/environments/environment.rb | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb index 46363a2b21..45fd0d4165 100644 --- a/railties/environments/environment.rb +++ b/railties/environments/environment.rb @@ -1,8 +1,20 @@ -RAILS_ROOT = File.dirname(__FILE__) + "/../" +# Load the Rails framework and configure your application. +# You can include your own configuration at the end of this file. +# +# Be sure to restart your webserver when you modify this file. + +# The path to the root directory of your application. +RAILS_ROOT = File.join(File.dirname(__FILE__), '..') + +# The environment your application is currently running. Don't set +# this here; put it in your webserver's configuration as the RAILS_ENV +# environment variable instead. +# +# See config/environments/*.rb for environment-specific configuration. RAILS_ENV = ENV['RAILS_ENV'] || 'development' -# Mocks first. +# Load the Rails framework. Mock classes for testing come first. ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"] # Then model subdirectories. @@ -62,6 +74,8 @@ end [ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER } [ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" } + +# Set up routes. ActionController::Routing::Routes.reload Controllers = Dependencies::LoadingModule.root( @@ -70,3 +84,4 @@ Controllers = Dependencies::LoadingModule.root( ) # Include your app's configuration here: + |