aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-08-02 18:36:41 +0200
committerXavier Noria <fxn@hashref.com>2012-08-02 21:59:22 +0200
commit8f58d6e5074a623bed752d5ba38513305f03fae9 (patch)
treed67dc9b20392d1adb430957193b2148cb016dce0 /actionmailer
parent1a7b2e8fadc34a70ad891b3b111a06e384fd3c6d (diff)
downloadrails-8f58d6e5074a623bed752d5ba38513305f03fae9.tar.gz
rails-8f58d6e5074a623bed752d5ba38513305f03fae9.tar.bz2
rails-8f58d6e5074a623bed752d5ba38513305f03fae9.zip
load active_support/core_ext/object/blank in active_support/rails
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer.rb1
-rw-r--r--actionmailer/lib/action_mailer/base.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
index c73fbf77bc..1b0264fa41 100644
--- a/actionmailer/lib/action_mailer.rb
+++ b/actionmailer/lib/action_mailer.rb
@@ -28,7 +28,6 @@ require 'action_mailer/version'
# Common Active Support usage in Action Mailer
require 'active_support/rails'
require 'active_support/core_ext/class'
-require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/module/attr_internal'
require 'active_support/core_ext/module/delegation'
require 'active_support/core_ext/string/inflections'
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index 150d435140..900da9697e 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -1,6 +1,5 @@
require 'mail'
require 'action_mailer/collector'
-require 'active_support/core_ext/object/blank'
require 'active_support/core_ext/string/inflections'
require 'active_support/core_ext/hash/except'
require 'active_support/core_ext/module/anonymous'