aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJeroen van Dijk and Josh Kalderimis <jeroen@jeevidee.nl>2010-07-23 14:42:21 +0200
committerJosé Valim <jose.valim@gmail.com>2010-07-24 00:27:25 +0200
commitaffeb51569d291ef7304189fd77b32c6e269af57 (patch)
tree08cfb54e995012e834075f34c352044526bdc0bd /actionpack/lib/action_controller
parent5ebc1d88d3c80f8773d39b155a4e6f66544ec46b (diff)
downloadrails-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/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb2
1 files changed, 1 insertions, 1 deletions
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