diff options
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 4297d9bbf6..8611d0d3c3 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -13,6 +13,7 @@ module ActionController MODULES = [ AbstractController::Layouts, AbstractController::Translation, + AbstractController::AssetPaths, Helpers, HideActions, @@ -66,8 +67,7 @@ module ActionController @subclasses ||= [] end - # TODO Move this to the appropriate module - config_accessor :assets_dir, :asset_path, :javascripts_dir, :stylesheets_dir + config_accessor :asset_host, :asset_path ActiveSupport.run_load_hooks(:action_controller, self) end |