aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authoreileencodes <eileencodes@gmail.com>2016-04-27 15:47:22 -0500
committereileencodes <eileencodes@gmail.com>2016-04-27 15:48:47 -0500
commitf7a986012a6099445e20b6414d253ee0fc039118 (patch)
tree7097a0c9084254d42ae4f4ea57c0e6db849f6ad8 /actionmailer
parentba907d6caa92880bd3d7d5635823361f6fca829d (diff)
downloadrails-f7a986012a6099445e20b6414d253ee0fc039118.tar.gz
rails-f7a986012a6099445e20b6414d253ee0fc039118.tar.bz2
rails-f7a986012a6099445e20b6414d253ee0fc039118.zip
Prep Rails 5 beta 4
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md2
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 76d99f31c7..a271ed68f7 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,5 @@
+## 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.
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index cbe5fc3e64..d8e3a6ddbe 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -8,7 +8,7 @@ module ActionMailer
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta3"
+ PRE = "beta4"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end