diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-10-15 17:36:54 -0700 |
| commit | 71f7e75d95c47e4283a7cac0a2f776abf0a11d0e (patch) | |
| tree | 75a9b6825f9f81a9bec372af8db097b6ea022fc6 /actionmailer | |
| parent | 2d7abe245e7a2b1717e48ef550e4083318fd7ec2 (diff) | |
| parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
| download | rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.gz rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.tar.bz2 rails-71f7e75d95c47e4283a7cac0a2f776abf0a11d0e.zip | |
Merge branch 'master' into orchestra
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/test/abstract_unit.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb index a226054194..7843623996 100644 --- a/actionmailer/test/abstract_unit.rb +++ b/actionmailer/test/abstract_unit.rb @@ -20,7 +20,7 @@ ActiveSupport::Deprecation.debug = true ActionView::Template.register_template_handler :haml, lambda { |template| "Look its HAML!".inspect } ActionView::Template.register_template_handler :bak, lambda { |template| "Lame backup".inspect } -ActionView::Base.config = { :assets_dir => '/nowhere' } +ActionView::Base::DEFAULT_CONFIG = { :assets_dir => '/nowhere' } $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers" |