diff options
| author | Jeroen van Dijk and Josh Kalderimis <jeroen@jeevidee.nl> | 2010-07-23 14:42:21 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-07-24 00:27:25 +0200 |
| commit | affeb51569d291ef7304189fd77b32c6e269af57 (patch) | |
| tree | 08cfb54e995012e834075f34c352044526bdc0bd /actionpack/lib | |
| parent | 5ebc1d88d3c80f8773d39b155a4e6f66544ec46b (diff) | |
| download | rails-affeb51569d291ef7304189fd77b32c6e269af57.tar.gz rails-affeb51569d291ef7304189fd77b32c6e269af57.tar.bz2 rails-affeb51569d291ef7304189fd77b32c6e269af57.zip | |
Move config_accessor :asset_host from ActionController::Base to AbstractController which fixes issues with asset_host in ActionMailer
Including:
- Moved mailer objects in separate directory
- Added two tests for asset_host configuration option
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/abstract_controller/asset_paths.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/abstract_controller/asset_paths.rb b/actionpack/lib/abstract_controller/asset_paths.rb index 6d6f6ac607..16c900dcba 100644 --- a/actionpack/lib/abstract_controller/asset_paths.rb +++ b/actionpack/lib/abstract_controller/asset_paths.rb @@ -3,7 +3,7 @@ module AbstractController extend ActiveSupport::Concern included do - config_accessor :assets_dir, :javascripts_dir, :stylesheets_dir + config_accessor :asset_host, :assets_dir, :javascripts_dir, :stylesheets_dir end end end
\ No newline at end of file diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 1c6896d362..e47f9056f3 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -63,7 +63,7 @@ module ActionController klass.helper :all end - config_accessor :asset_host, :asset_path + config_accessor :asset_path ActiveSupport.run_load_hooks(:action_controller, self) end end |