aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-30 08:43:37 -0800
committerJeffrey Guenther <guenther.jeffrey@gmail.com>2017-11-30 08:43:37 -0800
commit241b5f1cebb17449f31e4170671ef70866605f8b (patch)
treee939f4aa85f321fd40090d5b5a31ecd25907135d /actionmailer
parent3429ab14a6f2380f4bd924fe9d9ad2eb967ae62b (diff)
parentf7e3c686685fb89e67293440d24356f93fa34847 (diff)
downloadrails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.gz
rails-241b5f1cebb17449f31e4170671ef70866605f8b.tar.bz2
rails-241b5f1cebb17449f31e4170671ef70866605f8b.zip
Merge branch 'master' into activestorage-guide
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/CHANGELOG.md7
-rw-r--r--actionmailer/README.rdoc4
-rw-r--r--actionmailer/lib/action_mailer/gem_version.rb2
3 files changed, 10 insertions, 3 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index 49afec9a12..2836f0cfbc 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,3 +1,10 @@
+## Rails 5.2.0.beta2 (November 28, 2017) ##
+
+* No changes.
+
+
+## Rails 5.2.0.beta1 (November 27, 2017) ##
+
* Add `assert_enqueued_email_with` test helper.
assert_enqueued_email_with ContactMailer, :welcome do
diff --git a/actionmailer/README.rdoc b/actionmailer/README.rdoc
index 9993d3777d..14dfb82234 100644
--- a/actionmailer/README.rdoc
+++ b/actionmailer/README.rdoc
@@ -148,7 +148,7 @@ The latest version of Action Mailer can be installed with RubyGems:
$ gem install actionmailer
-Source code can be downloaded as part of the Rails project on GitHub
+Source code can be downloaded as part of the Rails project on GitHub:
* https://github.com/rails/rails/tree/master/actionmailer
@@ -166,7 +166,7 @@ API documentation is at
* http://api.rubyonrails.org
-Bug reports can be filed for the Ruby on Rails project here:
+Bug reports for the Ruby on Rails project can be filed here:
* https://github.com/rails/rails/issues
diff --git a/actionmailer/lib/action_mailer/gem_version.rb b/actionmailer/lib/action_mailer/gem_version.rb
index 063d4580d8..6a7dd0a212 100644
--- a/actionmailer/lib/action_mailer/gem_version.rb
+++ b/actionmailer/lib/action_mailer/gem_version.rb
@@ -10,7 +10,7 @@ module ActionMailer
MAJOR = 5
MINOR = 2
TINY = 0
- PRE = "alpha"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end