diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:49:02 -0500 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2010-06-02 16:49:02 -0500 |
| commit | 631dc618853325e5780237388224cb785a3a1b82 (patch) | |
| tree | f690558ed895cc4e202bbe6fefd8eb3cc29aacff /actionpack | |
| parent | 942fe6514cc0db10c04fd2b46f8e1537beabef71 (diff) | |
| download | rails-631dc618853325e5780237388224cb785a3a1b82.tar.gz rails-631dc618853325e5780237388224cb785a3a1b82.tar.bz2 rails-631dc618853325e5780237388224cb785a3a1b82.zip | |
Extract assets paths and make them available to Action Mailer as well
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb index 2da4dc052c..5990a1bbd0 100644 --- a/actionpack/lib/abstract_controller.rb +++ b/actionpack/lib/abstract_controller.rb @@ -20,5 +20,6 @@ module AbstractController autoload :Logger autoload :Rendering autoload :Translation + autoload :AssetPaths autoload :ViewPaths end diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 4297d9bbf6..73e07d59e3 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, @@ -67,7 +68,7 @@ module ActionController end # TODO Move this to the appropriate module - config_accessor :assets_dir, :asset_path, :javascripts_dir, :stylesheets_dir + config_accessor :asset_path ActiveSupport.run_load_hooks(:action_controller, self) end |