aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--railties/CHANGELOG2
-rw-r--r--railties/environments/environment.rb6
2 files changed, 3 insertions, 5 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index a59177aa4d..f81838669a 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
*SVN*
+* Revert environment changes for autoload_paths. [Koz]
+
* Update to latest Prototype, which doesn't serialize disabled form elements, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]
* Clean up the output of rake stats, de-emphasise components and apis, and remove the indents for tests [Koz]
diff --git a/railties/environments/environment.rb b/railties/environments/environment.rb
index 71cb1667f4..f6301dab95 100644
--- a/railties/environments/environment.rb
+++ b/railties/environments/environment.rb
@@ -19,13 +19,9 @@ Rails::Initializer.run do |config|
# Only load the plugins named here, by default all plugins in vendor/plugins are loaded
# config.plugins = %W( exception_notification ssl_requirement )
- # Add additional load paths (these are searched when explicitly require something)
+ # Add additional load paths for your own custom dirs
# config.load_paths += %W( #{RAILS_ROOT}/extras )
- # Add additional autoloading load paths
- # (these paths will be subject to auto-loading of constants)
- # config.autoload_paths += Dir["#{RAILS_ROOT}/models/*/"]
-
# Force all environments to use the same logger level
# (by default production uses :info, the others :debug)
# config.log_level = :debug