diff options
| author | Prem Sichanugrist <s@sikachu.com> | 2011-04-14 00:40:18 +0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-13 19:52:19 +0200 |
| commit | 0f8a6ebba39e278b9a4426cdc4f5139484585afd (patch) | |
| tree | 2b69478aebb2487da0ed95a129550758f8375caf | |
| parent | eebb19c954d64760c232cda10263200f32fcf036 (diff) | |
| download | rails-0f8a6ebba39e278b9a4426cdc4f5139484585afd.tar.gz rails-0f8a6ebba39e278b9a4426cdc4f5139484585afd.tar.bz2 rails-0f8a6ebba39e278b9a4426cdc4f5139484585afd.zip | |
Fix missing requires in Action Mailer
This made the isolated test failed on CI server.
Signed-off-by: Xavier Noria <fxn@hashref.com>
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 1 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.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 cd76383931..1bde73563e 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -5,6 +5,7 @@ require 'active_support/core_ext/array/wrap' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/proc' require 'active_support/core_ext/string/inflections' +require 'active_support/core_ext/hash/except' require 'action_mailer/log_subscriber' module ActionMailer #:nodoc: diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 691310d5d2..ecd0c4fb73 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,5 +1,6 @@ require "abstract_controller/base" require "action_view" +require "active_support/core_ext/object/instance_variables" module AbstractController class DoubleRenderError < Error |