diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-06-30 20:47:26 +0200 |
| commit | c63cf7bf0db708fe46a929cf57649ab5a92034af (patch) | |
| tree | 8f0974852b51597652e6ae73da26f3eb80fe878b /railties/lib/rails/application | |
| parent | 52c56f9f7ec46ee39f1a6319ff4017e2492683ed (diff) | |
| parent | b07e6fdaa0aa07016d1425ada5b7f966142d0212 (diff) | |
| download | rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.gz rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.tar.bz2 rails-c63cf7bf0db708fe46a929cf57649ab5a92034af.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'railties/lib/rails/application')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index e3165b2d4c..465851c0e6 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -10,7 +10,7 @@ module Rails attr_accessor :allow_concurrency, :cache_classes, :cache_store, :encoding, :consider_all_requests_local, :dependency_loading, :filter_parameters, :log_level, :logger, :middleware, - :plugins, :preload_frameworks, :reload_engines, :reload_plugins, + :plugins, :preload_frameworks, :reload_plugins, :secret_token, :serve_static_assets, :session_options, :time_zone, :whiny_nils @@ -59,7 +59,7 @@ module Rails if File.exists?("#{root}/test/mocks/#{Rails.env}") ActiveSupport::Deprecation.warn "\"Rails.root/test/mocks/#{Rails.env}\" won't be added " << "automatically to load paths anymore in future releases" - paths.mocks_path "test/mocks", :load_path => true, :glob => Rails.env + paths.mocks_path "test/mocks", :autoload => true, :glob => Rails.env end paths |