aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/application
diff options
context:
space:
mode:
authorPiotr Sarnacki <drogus@gmail.com>2010-07-19 14:53:15 +0200
committerPiotr Sarnacki <drogus@gmail.com>2010-09-03 22:59:04 +0200
commit939d4255e690bd0406179cad00836975273fd49e (patch)
tree1753974a2221210ebd6b68b14d1db45951b3fddd /railties/lib/rails/application
parent7cccfed5943cddd6d72ed0df0ee7291cca9025ad (diff)
downloadrails-939d4255e690bd0406179cad00836975273fd49e.tar.gz
rails-939d4255e690bd0406179cad00836975273fd49e.tar.bz2
rails-939d4255e690bd0406179cad00836975273fd49e.zip
Removed most of deprecated stuff from Application and Engine
Diffstat (limited to 'railties/lib/rails/application')
-rw-r--r--railties/lib/rails/application/configuration.rb9
1 files changed, 0 insertions, 9 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index c248d41e59..7e34a16487 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -1,12 +1,9 @@
-require 'active_support/deprecation'
require 'active_support/core_ext/string/encoding'
require 'rails/engine/configuration'
module Rails
class Application
class Configuration < ::Rails::Engine::Configuration
- include ::Rails::Configuration::Deprecated
-
attr_accessor :allow_concurrency, :cache_classes, :cache_store,
:encoding, :consider_all_requests_local, :dependency_loading,
:filter_parameters, :log_level, :logger,
@@ -53,12 +50,6 @@ module Rails
paths.tmp "tmp"
paths.tmp.cache "tmp/cache"
- 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", :autoload => true, :glob => Rails.env
- end
-
paths
end
end