From affeb51569d291ef7304189fd77b32c6e269af57 Mon Sep 17 00:00:00 2001 From: Jeroen van Dijk and Josh Kalderimis Date: Fri, 23 Jul 2010 14:42:21 +0200 Subject: 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 --- actionpack/lib/abstract_controller/asset_paths.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/lib/abstract_controller') 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 -- cgit v1.2.3