diff options
| author | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-10-16 01:08:18 -0300 |
| commit | 9ba83cce0318fa5051764f4a16c286adf30169e2 (patch) | |
| tree | b1158e6916d69687c1b3e003aa97534a9135f460 /actionmailer | |
| parent | 8b340ab2f62bac2af9d5917e296bb4101530282a (diff) | |
| parent | ef70ad5538c4ce02c4d31ef01a8db6b55c837571 (diff) | |
| download | rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.gz rails-9ba83cce0318fa5051764f4a16c286adf30169e2.tar.bz2 rails-9ba83cce0318fa5051764f4a16c286adf30169e2.zip | |
Merge branch 'master' of git://github.com/rails/rails
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" |