aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
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 /activerecord
parent633969f159c4f1ff23d98ec6e25cf84a78994824 (diff)
downloadrails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.gz
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.bz2
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.zip
Preparing for Rails 5.0.0.beta2
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md5
-rw-r--r--activerecord/lib/active_record/gem_version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 50a0b291b3..63a7dd4968 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
* `ActiveRecord::Relation#reverse_order` throws `ActiveRecord::IrreversibleOrderError`
when the order can not be reversed using current trivial algorithm.
Also raises the same error when `#reverse_order` is called on
diff --git a/activerecord/lib/active_record/gem_version.rb b/activerecord/lib/active_record/gem_version.rb
index b4f2f66e1c..aa1f5c4fb4 100644
--- a/activerecord/lib/active_record/gem_version.rb
+++ b/activerecord/lib/active_record/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveRecord
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end