aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2014-08-23 03:45:47 +0930
committerMatthew Draper <matthew@trebex.net>2014-08-23 03:45:47 +0930
commitb47d8dea25aa4c1b0d02603adc00cf63f2163f21 (patch)
tree3f71edff63c140c8aafa85c52e1830b8da4c0a02 /actionmailer
parent91bd6121d8590268700476d57080ccfcaf6c7c44 (diff)
parent39704bb89f63ddca43268d5da70f1d06ba7fc9ac (diff)
downloadrails-b47d8dea25aa4c1b0d02603adc00cf63f2163f21.tar.gz
rails-b47d8dea25aa4c1b0d02603adc00cf63f2163f21.tar.bz2
rails-b47d8dea25aa4c1b0d02603adc00cf63f2163f21.zip
Merge pull request #16598 from seuros/master
[ActionMailer] require activejob railtie
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/railtie.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index c62d4b5082..05a3ac6a21 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -1,3 +1,4 @@
+require 'active_job/railtie'
require "action_mailer"
require "rails"
require "abstract_controller/railties/routes_helpers"