aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2016-02-01 14:27:38 -0700
committerSean Griffin <sean@seantheprogrammer.com>2016-02-01 14:37:52 -0700
commit49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9 (patch)
tree454e81ebf8d0697aabde55c265fdf15a8cf0437b /actionmailer
parent633969f159c4f1ff23d98ec6e25cf84a78994824 (diff)
downloadrails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.gz
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.bz2
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.zip
Preparing for Rails 5.0.0.beta2
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md5
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index e74e0bc20a..22e9bd12a1 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* `config.force_ssl = true` will set
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index d28568b6a1..a1ee5fb238 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 = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end