aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2017-03-22 10:11:39 +1030
committerMatthew Draper <matthew@trebex.net>2017-03-22 10:11:39 +1030
commit6c08d480f13d3332c878ca8a120a03fcd78f7ba2 (patch)
treeade18a9203afbc55db46aee904a087e8d9cec3d0 /activemodel
parent88b16843f67bcd96395444ba8f139895351da0bc (diff)
downloadrails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.tar.gz
rails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.tar.bz2
rails-6c08d480f13d3332c878ca8a120a03fcd78f7ba2.zip
Start Rails 5.2 development
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md33
-rw-r--r--activemodel/lib/active_model/gem_version.rb4
2 files changed, 3 insertions, 34 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 1503b6a3e4..3bb5005275 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,32 +1 @@
-## Rails 5.1.0.beta1 (February 23, 2017) ##
-
-* Remove deprecated behavior that halts callbacks when the return is false.
-
- *Rafael Mendonça França*
-
-* Remove unused `ActiveModel::TestCase` class.
-
- *Yuji Yaginuma*
-
-* Moved DecimalWithoutScale, Text, and UnsignedInteger from Active Model to Active Record
-
- *Iain Beeston*
-
-* Allow indifferent access in `ActiveModel::Errors`.
-
- `#include?`, `#has_key?`, `#key?`, `#delete` and `#full_messages_for`.
-
- *Kenichi Kamiya*
-
-* Removed deprecated `:tokenizer` in the length validator.
-
- *Rafael Mendonça França*
-
-* Removed deprecated methods in `ActiveModel::Errors`.
-
- `#get`, `#set`, `[]=`, `add_on_empty` and `add_on_blank`.
-
- *Rafael Mendonça França*
-
-
-Please check [5-0-stable](https://github.com/rails/rails/blob/5-0-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activemodel/CHANGELOG.md) for previous changes.
diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb
index 6a2ab2a8e5..67bdfaa643 100644
--- a/activemodel/lib/active_model/gem_version.rb
+++ b/activemodel/lib/active_model/gem_version.rb
@@ -6,9 +6,9 @@ module ActiveModel
module VERSION
MAJOR = 5
- MINOR = 1
+ MINOR = 2
TINY = 0
- PRE = "beta1"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end