aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
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 /activemodel
parent633969f159c4f1ff23d98ec6e25cf84a78994824 (diff)
downloadrails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.gz
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.tar.bz2
rails-49f6ce63f33b7817bcbd0cdf5f8881b63f40d9c9.zip
Preparing for Rails 5.0.0.beta2
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md5
-rw-r--r--activemodel/lib/active_model/gem_version.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index e4769d2f40..318e507ff1 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,3 +1,8 @@
+## Rails 5.0.0.beta2 (February 01, 2016) ##
+
+* No changes.
+
+
## Rails 5.0.0.beta1 (December 18, 2015) ##
* Validate multiple contexts on `valid?` and `invalid?` at once.
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
index 4563f860c3..94514a0657 100644
--- a/activemodel/lib/active_model/gem_version.rb
+++ b/activemodel/lib/active_model/gem_version.rb
@@ -8,7 +8,7 @@ module ActiveModel
MAJOR = 5
MINOR = 0
TINY = 0
- PRE = "beta1.1"
+ PRE = "beta2"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end