aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2008-11-25 18:48:46 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2008-11-25 18:48:46 -0800
commit8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0 (patch)
treec68b0a9a12b4079ad375a1172b3186a83755cabf /actionmailer
parentd9c95c82e5d522f42ac866462773ee078afcddf2 (diff)
parentc80fe1093deeb57eee8df11d3c4120158634cb81 (diff)
downloadrails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.gz
rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.tar.bz2
rails-8d2ca7dde1993dea6f01ea504e7c1e154a09dbd0.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/helpers.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/helpers.rb b/actionmailer/lib/action_mailer/helpers.rb
index 5f6dcd77cd..31f7de8d60 100644
--- a/actionmailer/lib/action_mailer/helpers.rb
+++ b/actionmailer/lib/action_mailer/helpers.rb
@@ -1,3 +1,5 @@
+require 'active_support/dependencies'
+
module ActionMailer
module Helpers #:nodoc:
def self.included(base) #:nodoc: