Merge branch 'master' into adequaterecord

* master: (311 commits)
  Add a missing changelog entry for #13981 and #14035
  Revert "Fixed plugin_generator test"
  implements new option :month_format_string for date select helpers [Closes #13618]
  add factory methods for empty alias trackers
  guarantee a list in the alias tracker so we can remove a conditional
  stop exposing table_joins
  make most parameters to the AliasTracker required
  make a singleton for AssociationScope
  pass the association and connection to the scope method
  pass the tracker down the stack and construct it in the scope method
  clean up add_constraints signature
  remove the reflection delegate
  remove klass delegator
  remove railties changes. fixes #14054
  remove chain delegate
  remove scope_chain delegate
  Add verb to sanitization note
  fix path shown in mailer's templates
  updated Travis build status image url
  fix guide active_support_core_extensions. add Note to String#indent [ci skip]
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency.rb
	activerecord/test/cases/associations/association_scope_test.rb

1 files changed, 23 insertions, 1 deletions

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 1867a392eb..5a61746700 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,4 +1,26 @@
-*   Add mailer previews feature based on 37 Signals mail_view gem
+*   Support the use of underscored symbols when registering interceptors and
+    observers like we do elsewhere within Rails.
+
+    *Andrew White*
+
+*   Add the ability to intercept emails before previewing in a similar fashion
+    to how emails can be intercepted before delivery.
+
+    Fixes #13622.
+
+    Example:
+
+        class CSSInlineStyler
+          def self.previewing_email(message)
+            # inline CSS styles
+          end
+        end
+
+        ActionMailer::Base.register_preview_interceptor CSSInlineStyler
+
+    *Andrew White*
+
+*   Add mailer previews feature based on 37 Signals mail_view gem.
 
     *Andrew White*