Start Rails 5.1 development :tada:

2 files changed, 3 insertions, 142 deletions

diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index e916305e54..d45e74133a 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,141 +1,2 @@
-## Rails 5.0.0.rc1 (May 06, 2016) ##
 
-*   No changes.
-
-
-## Rails 5.0.0.beta4 (April 27, 2016) ##
-
-*   Disallow calling `#deliver_later` after making local modifications to
-    the message which would be lost when the delivery job is enqueued.
-
-    Prevents a common, hard-to-find bug like:
-
-        message = Notifier.welcome(user, foo)
-        message.message_id = my_generated_message_id
-        message.deliver_later
-
-    The message_id is silently lost! *Only the mailer arguments are passed
-    to the delivery job.*
-
-    This raises an exception now. Make modifications to the message within
-    the mailer method instead, or use a custom Active Job to manage delivery
-    instead of using #deliver_later.
-
-    *Jeremy Daer*
-
-*   Removes `-t` from default Sendmail arguments to match the underlying
-    `Mail::Sendmail` setting.
-
-    *Clayton Liggitt*
-
-
-## Rails 5.0.0.beta3 (February 24, 2016) ##
-
-*   Add support for fragment caching in Action Mailer views.
-
-    *Stan Lo*
-
-*   Reset `ActionMailer::Base.deliveries` after every test in
-    `ActionDispatch::IntegrationTest`.
-
-    *Yves Senn*
-
-
-## Rails 5.0.0.beta2 (February 01, 2016) ##
-
-*   No changes.
-
-
-## Rails 5.0.0.beta1 (December 18, 2015) ##
-
-*   `config.action_mailer.default_url_options[:protocol]` is now set to `https` if `config.force_ssl` is set to `true`.
-
-    *Andrew Kampjes*
-
-*   Add `config.action_mailer.deliver_later_queue_name` configuration to set the
-    mailer queue name.
-
-    *Chris McGrath*
-
-*   `assert_emails` in block form, uses the given number as expected value.
-    This makes the error message much easier to understand.
-
-    *Yuji Yaginuma*
-
-*   Add support for inline images in mailer previews by using an interceptor
-    class to convert cid: urls in image src attributes to data urls.
-
-    *Andrew White*
-
-*   Mailer preview now uses `url_for` to fix links to emails for apps running on
-    a subdirectory.
-
-    *Remo Mueller*
-
-*   Mailer previews no longer crash when the `mail` method wasn't called
-    (`NullMail`).
-
-    Fixes #19849.
-
-    *Yves Senn*
-
-*   Make sure labels and values line up in mailer previews.
-
-    *Yves Senn*
-
-*   Add `assert_enqueued_emails` and `assert_no_enqueued_emails`.
-
-    Example:
-
-        def test_emails
-          assert_enqueued_emails 2 do
-            ContactMailer.welcome.deliver_later
-            ContactMailer.welcome.deliver_later
-          end
-        end
-
-        def test_no_emails
-          assert_no_enqueued_emails do
-            # No emails enqueued here
-          end
-        end
-
-    *George Claghorn*
-
-*   Add `_mailer` suffix to mailers created via generator, following the same
-    naming convention used in controllers and jobs.
-
-    *Carlos Souza*
-
-*   Remove deprecated `*_path` helpers in email views.
-
-    *Rafael Mendonça França*
-
-*   Remove deprecated `deliver` and `deliver!` methods.
-
-    *claudiob*
-
-*   Template lookup now respects default locale and I18n fallbacks.
-
-    Given the following templates:
-
-        mailer/demo.html.erb
-        mailer/demo.en.html.erb
-        mailer/demo.pt.html.erb
-
-    Before this change, for a locale that doesn't have its associated file, the
-    `mailer/demo.html.erb` would be rendered even if `en` was the default locale.
-
-    Now `mailer/demo.en.html.erb` has precedence over the file without locale.
-
-    Also, it is possible to give a fallback.
-
-        mailer/demo.pt.html.erb
-        mailer/demo.pt-BR.html.erb
-
-    So if the locale is `pt-PT`, `mailer/demo.pt.html.erb` will be rendered given
-    the right I18n fallback configuration.
-
-    *Rafael Mendonça França*
-
-Please check [4-2-stable](https://github.com/rails/rails/blob/4-2-stable/actionmailer/CHANGELOG.md) for previous changes.
+Please check [5-0-stable](https://github.com/rails/rails/blob/5-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 759b932c58..7dafceef2b 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 = 0
+    MINOR = 1
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "alpha"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end