aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-12-30 12:40:32 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-12-30 12:40:32 -0800
commitd9615928866115015e9ec48ac88a90869ef85d9b (patch)
treee6783aeeb36f1b8263d97d2548a39a4e5ee58fa6 /actionmailer
parent276ec16007b03d0a527fb0b83a7ee0b81e460fa1 (diff)
parent82443ecfad5e756da922d6a166b0093c8a74d720 (diff)
downloadrails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.gz
rails-d9615928866115015e9ec48ac88a90869ef85d9b.tar.bz2
rails-d9615928866115015e9ec48ac88a90869ef85d9b.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/test/abstract_unit.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 4900f6fb35..a6126d6f7f 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -17,7 +17,6 @@ $:.unshift "#{File.dirname(__FILE__)}/fixtures/helpers"
FIXTURE_LOAD_PATH = File.join(File.dirname(__FILE__), 'fixtures')
ActionMailer::Base.template_root = FIXTURE_LOAD_PATH
-ActionMailer::Base.template_root.load
class MockSMTP
def self.deliveries