Add active_model/railtie back to generated boot.rb, add models back to paths, load active_support/railtie since we need it and ensure default logger is set before config.

1 files changed, 4 insertions, 5 deletions

diff --git a/actionmailer/lib/action_mailer/railtie.rb b/actionmailer/lib/action_mailer/railtie.rb
index fbbcf98854..7ed1519e36 100644
--- a/actionmailer/lib/action_mailer/railtie.rb
+++ b/actionmailer/lib/action_mailer/railtie.rb
@@ -8,15 +8,14 @@ module ActionMailer
     require "action_mailer/railties/subscriber"
     subscriber ActionMailer::Railties::Subscriber.new
 
+    initializer "action_mailer.logger" do
+      ActionMailer::Base.logger ||= Rails.logger
+    end
+
     initializer "action_mailer.set_configs" do |app|
       app.config.action_mailer.each do |k,v|
         ActionMailer::Base.send "#{k}=", v
       end
     end
-
-    # TODO: ActionController::Base.logger should delegate to its own config.logger
-    initializer "action_mailer.logger" do
-      ActionMailer::Base.logger ||= Rails.logger
-    end
   end
 end
\ No newline at end of file