aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2019-02-25 17:45:04 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2019-02-25 17:45:04 -0500
commit5e6e505083c2b0caf85b2f86c6be3ff3d8750857 (patch)
treeb93de0c9d6fffaa93b01656b4552fe9cab44c30c /activerecord
parentdcb13470991539ab581e02670738900c39976ff4 (diff)
downloadrails-5e6e505083c2b0caf85b2f86c6be3ff3d8750857.tar.gz
rails-5e6e505083c2b0caf85b2f86c6be3ff3d8750857.tar.bz2
rails-5e6e505083c2b0caf85b2f86c6be3ff3d8750857.zip
Preparing for 6.0.0.beta2 release
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md2
-rw-r--r--activerecord/lib/active_record/gem_version.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 7e153a6642..77cb167e7c 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,5 @@
+## Rails 6.0.0.beta2 (February 25, 2019) ##
+
* Fix prepared statements caching to be enabled even when query caching is enabled.
*Ryuta Kamizono*
diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
index 16dff9c2b0..345441eea8 100644
--- a/activerecord/lib/active_record/gem_version.rb
+++ b/activerecord/lib/active_record/gem_version.rb
@@ -10,7 +10,7 @@ module ActiveRecord
MAJOR = 6
MINOR = 0
TINY = 0
- PRE = "beta1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end