Start Rails 5.2 development

2 files changed, 3 insertions, 35 deletions

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index ee33450b45..e488d867de 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,33 +1 @@
-## Rails 5.1.0.beta1 (February 23, 2017) ##
-
-*   Add `:args` to `process.action_mailer` event.
-
-    *Yuji Yaginuma*
-
-*   Add parameterized invocation of mailers as a way to share before filters and defaults between actions.
-    See `ActionMailer::Parameterized` for a full example of the benefit.
-
-    *DHH*
-
-*   Allow lambdas to be used as lazy defaults in addition to procs.
-
-    *DHH*
-
-*   Mime type: allow to custom content type when setting body in headers
-    and attachments.
-
-    Example:
-
-        def test_emails
-          attachments["invoice.pdf"] = "This is test File content"
-          mail(body: "Hello there", content_type: "text/html")
-        end
-
-    *Minh Quy*
-
-*   Exception handling: use `rescue_from` to handle exceptions raised by
-    mailer actions, by message delivery, and by deferred delivery jobs.
-
-    *Jeremy Daer*
-
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-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 de2d71bd3e..f5594ef928 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -6,9 +6,9 @@ module ActionMailer
 
   module VERSION
     MAJOR = 5
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
-    PRE   = "beta1"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end