From 9834be65655e8552d25633b7376ab0654a23875d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Wed, 24 Apr 2019 15:57:14 -0400
Subject: Start Rails 6.1 development

---
 actionmailer/CHANGELOG.md                     | 80 +--------------------------
 actionmailer/lib/action_mailer/gem_version.rb |  4 +-
 2 files changed, 3 insertions(+), 81 deletions(-)

(limited to 'actionmailer')

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 182c43551d..cb22a4e373 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,81 +1,3 @@
-## Rails 6.0.0.beta3 (March 11, 2019) ##
 
-*   No changes.
 
-
-## Rails 6.0.0.beta2 (February 25, 2019) ##
-
-*   No changes.
-
-
-## Rails 6.0.0.beta1 (January 18, 2019) ##
-
-*   Deprecate `ActionMailer::Base.receive` in favor of [Action Mailbox](https://github.com/rails/rails/tree/master/actionmailbox).
-
-    *George Claghorn*
-
-*   Add `MailDeliveryJob` for delivering both regular and parameterized mail. Deprecate using `DeliveryJob` and `Parameterized::DeliveryJob`.
-
-    *Gannon McGibbon*
-
-*   Fix ActionMailer assertions not working when a Mail defines
-    a custom delivery job class
-
-    *Edouard Chin*
-
-*   Mails with multipart `format` blocks with implicit render now also check for
-    a template name in options hash instead of only using the action name.
-
-    *Marcus Ilgner*
-
-*   `ActionDispatch::IntegrationTest` includes `ActionMailer::TestHelper` module by default.
-
-    *Ricardo Díaz*
-
-*   Add `perform_deliveries` to a payload of `deliver.action_mailer` notification.
-
-    *Yoshiyuki Kinjo*
-
-*   Change delivery logging message when `perform_deliveries` is false.
-
-    *Yoshiyuki Kinjo*
-
-*   Allow call `assert_enqueued_email_with` with no block.
-
-    Example:
-    ```
-    def test_email
-      ContactMailer.welcome.deliver_later
-      assert_enqueued_email_with ContactMailer, :welcome
-    end
-
-    def test_email_with_arguments
-      ContactMailer.welcome("Hello", "Goodbye").deliver_later
-      assert_enqueued_email_with ContactMailer, :welcome, args: ["Hello", "Goodbye"]
-    end
-    ```
-
-    *bogdanvlviv*
-
-*   Ensure mail gem is eager autoloaded when eager load is true to prevent thread deadlocks.
-
-    *Samuel Cochran*
-
-*   Perform email jobs in `assert_emails`.
-
-    *Gannon McGibbon*
-
-*   Add `Base.unregister_observer`, `Base.unregister_observers`,
-    `Base.unregister_interceptor`, `Base.unregister_interceptors`,
-    `Base.unregister_preview_interceptor` and `Base.unregister_preview_interceptors`.
-    This makes it possible to dynamically add and remove email observers and
-    interceptors at runtime in the same way they're registered.
-
-    *Claudio Ortolina*, *Kota Miyake*
-
-*   Rails 6 requires Ruby 2.5.0 or newer.
-
-    *Jeremy Daer*, *Kasper Timm Hansen*
-
-
-Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [6-0-stable](https://github.com/rails/rails/blob/6-0-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index 4efcd966db..78235dee14 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -8,9 +8,9 @@ module ActionMailer
 
   module VERSION
     MAJOR = 6
-    MINOR = 0
+    MINOR = 1
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end
-- 
cgit v1.2.3