diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-03-28 11:34:16 -0700 |
| commit | 7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d (patch) | |
| tree | 9e622391ee98e330c96f7e0938120633128f365e /actionmailer | |
| parent | d1f3437cac77673bf00fd95c5a0b7c1676d70603 (diff) | |
| parent | c99194c7bed6744104e114ab231ef39158044a63 (diff) | |
| download | rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.gz rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.tar.bz2 rails-7e3b4c1f2f0c435f1fa5f8f093ce6934d6a1207d.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 | ||||
| -rw-r--r-- | actionmailer/lib/action_mailer/old_api.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 0519783d02..793cd53518 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -2,6 +2,7 @@ require 'mail' require 'action_mailer/tmail_compat' require 'action_mailer/collector' require 'active_support/core_ext/array/wrap' +require 'active_support/core_ext/object/blank' module ActionMailer #:nodoc: # Action Mailer allows you to send email from your application using a mailer model and views. diff --git a/actionmailer/lib/action_mailer/old_api.rb b/actionmailer/lib/action_mailer/old_api.rb index c7f341d46c..7c59a8ae50 100644 --- a/actionmailer/lib/action_mailer/old_api.rb +++ b/actionmailer/lib/action_mailer/old_api.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/object/try' +require 'active_support/core_ext/object/blank' module ActionMailer module OldApi #:nodoc: |