aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/base.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-04-22 12:00:13 +0200
committerJosé Valim <jose.valim@gmail.com>2010-04-22 12:00:13 +0200
commit4163ccec2343ee66e2488f067eab2a15260e1219 (patch)
tree70213bd4d187c88b2fd0bbf05a54eed7ec3a49f7 /actionpack/lib/action_controller/base.rb
parenta8330c2006e90a6da8f621fdaf1156fa63b4049a (diff)
downloadrails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.gz
rails-4163ccec2343ee66e2488f067eab2a15260e1219.tar.bz2
rails-4163ccec2343ee66e2488f067eab2a15260e1219.zip
Clean up the config object in ActionPack. Create config_accessor which just delegates to the config object, reducing the number of deprecations and add specific tests.
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
-rw-r--r--actionpack/lib/action_controller/base.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 2e94a20d9d..092fe98588 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -65,8 +65,11 @@ module ActionController
@subclasses ||= []
end
+ # TODO Move this to the appropriate module
+ config_accessor :assets_dir, :asset_path, :javascripts_dir, :stylesheets_dir
+
ActiveSupport.run_load_hooks(:action_controller, self)
end
end
-require "action_controller/deprecated/base"
+require "action_controller/deprecated/base" \ No newline at end of file