diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:56:24 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:56:24 -0500 |
| commit | 3a066e81b34fbad93edce1776354f879f30ce4e8 (patch) | |
| tree | b25fb5e8d3f8d5f7d1aa45105b6d73e99c958bcb | |
| parent | 4aac5fd7118065444cb860f1d76a0a76d3914364 (diff) | |
| parent | 71375c8936696d8d7404e02ff84e3dbde3d57029 (diff) | |
| download | rails-3a066e81b34fbad93edce1776354f879f30ce4e8.tar.gz rails-3a066e81b34fbad93edce1776354f879f30ce4e8.tar.bz2 rails-3a066e81b34fbad93edce1776354f879f30ce4e8.zip | |
Merge branch 'master' of github.com:rails/rails
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 73e07d59e3..8611d0d3c3 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -67,8 +67,7 @@ module ActionController @subclasses ||= [] end - # TODO Move this to the appropriate module - config_accessor :asset_path + config_accessor :asset_host, :asset_path ActiveSupport.run_load_hooks(:action_controller, self) end |