1 files changed, 22 insertions, 45 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 487e57be7b..fc9aefd416 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,60 +1,37 @@
-## Rails 4.0.0 (unreleased) ##
+*   Add mailer previews feature based on 37 Signals mail_view gem
 
+    *Andrew White*
 
-## Rails 4.0.0.beta1 (February 25, 2013) ##
+*   Calling `mail()` without arguments serves as getter for the current mail
+    message and keeps previously set headers.
 
-*   Allow passing interpolations to `#default_i18n_subject`, e.g.:
+    Example:
 
-        # config/locales/en.yml
-        en:
-          user_mailer:
-            welcome:
-              subject: 'Hello, %{username}'
+        class MailerWithCallback < ActionMailer::Base
+          after_action :a_callback
 
-        # app/mailers/user_mailer.rb
-        class UserMailer < ActionMailer::Base
-          def welcome(user)
-            mail(subject: default_i18n_subject(username: user.name))
+          def welcome
+            mail subject: "subject", to: ["joe@example.com"]
           end
-        end
-
-    *Olek Janiszewski*
-
-*   Eager loading made to use relation's `in_clause_length` instead of host's one.
-    Fixes #8474.
-
-    *Boris Staal*
-
-*   Explicit multipart messages no longer set the order of the MIME parts.
-    *Nate Berkopec*
 
-*   Do not render views when mail() isn't called.
-    Fixes #7761.
+          def a_callback
+            mail # => returns the current mail message
+          end
+        end
 
     *Yves Senn*
 
-*   Allow delivery method options to be set per mail instance *Aditya Sanghi*
-
-    If your smtp delivery settings are dynamic,
-    you can now override settings per mail instance for e.g.
-
-        def my_mailer(user,company)
-          mail to: user.email, subject: "Welcome!",
-               delivery_method_options: { user_name: company.smtp_user,
-                                          password: company.smtp_password }
-        end
+*   Instrument the generation of Action Mailer messages. The time it takes to
+    generate a message is written to the log.
 
-    This will ensure that your default SMTP settings will be overridden
-    by the company specific ones. You only have to override the settings
-    that are dynamic and leave the static setting in your environment
-    configuration file (e.g. config/environments/production.rb)
+    *Daniel Schierbeck*
 
-*   Allow to set default Action Mailer options via `config.action_mailer.default_options=` *Robert Pankowecki*
+*   Invoke mailer defaults as procs only if they are procs, do not convert with
+    `to_proc`. That an object is convertible to a proc does not mean it's meant
+    to be always used as a proc.
 
-*   Raise an `ActionView::MissingTemplate` exception when no implicit template could be found. *Damien Mathieu*
+    Fixes #11533.
 
-*   Allow callbacks to be defined in mailers similar to `ActionController::Base`. You can configure default
-    settings, headers, attachments, delivery settings or change delivery using
-    `before_filter`, `after_filter` etc. *Justin S. Leitgeb*
+    *Alex Tsukernik*
 
-Please check [3-2-stable](https://github.com/rails/rails/blob/3-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.