13 files changed, 3 insertions, 94 deletions
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/base.rb b/actionmailer/lib/action_mailer/base.rb
index c1ac9c2ad1..ba914c4813 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -591,7 +591,6 @@ module ActionMailer
       end
 
     private
-
       def set_payload_for_mail(payload, mail)
         payload[:mail]               = mail.encoded
         payload[:mailer]             = name
@@ -873,7 +872,6 @@ module ActionMailer
     end
 
     private
-
       # Used by #mail to set the content type of the message.
       #
       # It will use the given +user_content_type+, or multipart if the mail
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
diff --git a/actionmailer/lib/action_mailer/preview.rb b/actionmailer/lib/action_mailer/preview.rb
index 500b3bede0..a763b9776c 100644
--- a/actionmailer/lib/action_mailer/preview.rb
+++ b/actionmailer/lib/action_mailer/preview.rb
@@ -55,7 +55,6 @@ module ActionMailer
       end
 
       private
-
         def interceptor_class_for(interceptor)
           case interceptor
           when String, Symbol
diff --git a/actionmailer/lib/action_mailer/test_case.rb b/actionmailer/lib/action_mailer/test_case.rb
index ee5a864847..97afd87840 100644
--- a/actionmailer/lib/action_mailer/test_case.rb
+++ b/actionmailer/lib/action_mailer/test_case.rb
@@ -22,7 +22,6 @@ module ActionMailer
       end
 
       private
-
         def clear_test_deliveries
           if ActionMailer::Base.delivery_method == :test
             ActionMailer::Base.deliveries.clear
@@ -76,7 +75,6 @@ module ActionMailer
       end
 
       private
-
         def initialize_test_deliveries
           set_delivery_method :test
           @old_perform_deliveries = ActionMailer::Base.perform_deliveries
diff --git a/actionmailer/lib/action_mailer/test_helper.rb b/actionmailer/lib/action_mailer/test_helper.rb
index e222301dff..988db2491c 100644
--- a/actionmailer/lib/action_mailer/test_helper.rb
+++ b/actionmailer/lib/action_mailer/test_helper.rb
@@ -152,7 +152,6 @@ module ActionMailer
     end
 
     private
-
       def delivery_job_filter(job)
         job_class = job.is_a?(Hash) ? job.fetch(:job) : job.class
 
diff --git a/actionmailer/test/base_test.rb b/actionmailer/test/base_test.rb
index c07fca5b5e..4ea5634cd0 100644
--- a/actionmailer/test/base_test.rb
+++ b/actionmailer/test/base_test.rb
@@ -939,7 +939,6 @@ class BaseTest < ActiveSupport::TestCase
   end
 
   private
-
     # Execute the block setting the given values and restoring old values after
     # the block is executed.
     def swap(klass, new_values)
diff --git a/actionmailer/test/caching_test.rb b/actionmailer/test/caching_test.rb
index b658c96ec7..c3a3e418d0 100644
--- a/actionmailer/test/caching_test.rb
+++ b/actionmailer/test/caching_test.rb
@@ -189,7 +189,6 @@ class FunctionalFragmentCachingTest < BaseCachingTest
   end
 
   private
-
     def template_digest(name, format)
       ActionView::Digestor.digest(name: name, format: format, finder: @mailer.lookup_context)
     end
diff --git a/actionmailer/test/i18n_with_controller_test.rb b/actionmailer/test/i18n_with_controller_test.rb
index 6e75cff347..eea72e06ba 100644
--- a/actionmailer/test/i18n_with_controller_test.rb
+++ b/actionmailer/test/i18n_with_controller_test.rb
@@ -67,7 +67,6 @@ class ActionMailerI18nWithControllerTest < ActionDispatch::IntegrationTest
   end
 
   private
-
     def with_translation(locale, data)
       I18n.backend.store_translations(locale, data)
       yield
diff --git a/actionmailer/test/legacy_delivery_job_test.rb b/actionmailer/test/legacy_delivery_job_test.rb
index 3a3872df47..a9b2a160d4 100644
--- a/actionmailer/test/legacy_delivery_job_test.rb
+++ b/actionmailer/test/legacy_delivery_job_test.rb
@@ -69,7 +69,6 @@ class LegacyDeliveryJobTest < ActiveSupport::TestCase
   end
 
   private
-
     def with_delivery_job(job)
       old_params_delivery_job = ParamsMailer.delivery_job
       old_regular_delivery_job = DelayedMailer.delivery_job
diff --git a/actionmailer/test/mail_helper_test.rb b/actionmailer/test/mail_helper_test.rb
index 51d6ccb10f..a8ab19a95c 100644
--- a/actionmailer/test/mail_helper_test.rb
+++ b/actionmailer/test/mail_helper_test.rb
@@ -68,7 +68,6 @@ The second
   end
 
   private
-
     def mail_with_defaults(&block)
       mail(to: "test@localhost", from: "tester@example.com",
             subject: "using helpers", &block)
diff --git a/actionmailer/test/mailers/proc_mailer.rb b/actionmailer/test/mailers/proc_mailer.rb
index 76e730bb79..75ee5dd9b6 100644
--- a/actionmailer/test/mailers/proc_mailer.rb
+++ b/actionmailer/test/mailers/proc_mailer.rb
@@ -18,7 +18,6 @@ class ProcMailer < ActionMailer::Base
   end
 
   private
-
     def give_a_greeting
       "Thanks for signing up this afternoon"
     end
diff --git a/actionmailer/test/parameterized_test.rb b/actionmailer/test/parameterized_test.rb
index 7dd6156744..62dd671f48 100644
--- a/actionmailer/test/parameterized_test.rb
+++ b/actionmailer/test/parameterized_test.rb
@@ -81,7 +81,6 @@ class ParameterizedTest < ActiveSupport::TestCase
   end
 
   private
-
     def with_delivery_job(job)
       old_delivery_job = ParamsMailer.delivery_job
       ParamsMailer.delivery_job = job