aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-24 16:01:25 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-24 16:01:25 -0700
commit4b86e7bab06ef24870e593a3885ae568645b8940 (patch)
treeb3ad22555f5f1db74371de310fdf83d317b7c637 /actionpack
parent6f413d87b24a0dc5ec741d1190dc3023cd2fcfdb (diff)
parent21317d882446a1f9c02c2d7442727053745d8d01 (diff)
downloadrails-4b86e7bab06ef24870e593a3885ae568645b8940.tar.gz
rails-4b86e7bab06ef24870e593a3885ae568645b8940.tar.bz2
rails-4b86e7bab06ef24870e593a3885ae568645b8940.zip
Merge pull request #1283 from joshk/actiom_mailer_tests_fixed
corrected/fixed the ActionMailer tests
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_view/template/handlers/erb.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_view/template/handlers/erb.rb b/actionpack/lib/action_view/template/handlers/erb.rb
index 05171528d7..77720e2bc8 100644
--- a/actionpack/lib/action_view/template/handlers/erb.rb
+++ b/actionpack/lib/action_view/template/handlers/erb.rb
@@ -1,3 +1,4 @@
+require 'action_dispatch/http/mime_type'
require 'active_support/core_ext/class/attribute_accessors'
require 'erubis'