aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-30 18:51:17 -0500
committerRafael Mendonça França <rafaelmfranca@gmail.com>2018-01-30 18:51:17 -0500
commit1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7 (patch)
treed7534ff5a19ff20a996b381c047bb3b2004decdb /activemodel
parentbec74e1d4a05eb18eaf0dea9506b43569fd5cd05 (diff)
downloadrails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.tar.gz
rails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.tar.bz2
rails-1c383df324fdf0b68b3f54a649eb7d2a4f55bcb7.zip
Start Rails 6.0 development!!!
:tada::tada::tada:
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/CHANGELOG.md66
-rw-r--r--activemodel/lib/active_model/gem_version.rb6
2 files changed, 4 insertions, 68 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index 86353674d9..13ea7d0bf3 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,67 +1,3 @@
-* Models using the attributes API with a proc default can now be marshalled.
- Fixes #31216.
- *Sean Griffin*
-
-* Fix to working before/after validation callbacks on multiple contexts.
-
- *Yoshiyuki Hirano*
-
-
-## Rails 5.2.0.beta2 (November 28, 2017) ##
-
-* No changes.
-
-
-## Rails 5.2.0.beta1 (November 27, 2017) ##
-
-* Execute `ConfirmationValidator` validation when `_confirmation`'s value is `false`.
-
- *bogdanvlviv*
-
-* Allow passing a Proc or Symbol to length validator options.
-
- *Matt Rohrer*
-
-* Add method `#merge!` for `ActiveModel::Errors`.
-
- *Jahfer Husain*
-
-* Fix regression in numericality validator when comparing Decimal and Float input
- values with more scale than the schema.
-
- *Bradley Priest*
-
-* Fix methods `#keys`, `#values` in `ActiveModel::Errors`.
-
- Change `#keys` to only return the keys that don't have empty messages.
-
- Change `#values` to only return the not empty values.
-
- Example:
-
- # Before
- person = Person.new
- person.errors.keys # => []
- person.errors.values # => []
- person.errors.messages # => {}
- person.errors[:name] # => []
- person.errors.messages # => {:name => []}
- person.errors.keys # => [:name]
- person.errors.values # => [[]]
-
- # After
- person = Person.new
- person.errors.keys # => []
- person.errors.values # => []
- person.errors.messages # => {}
- person.errors[:name] # => []
- person.errors.messages # => {:name => []}
- person.errors.keys # => []
- person.errors.values # => []
-
- *bogdanvlviv*
-
-
-Please check [5-1-stable](https://github.com/rails/rails/blob/5-1-stable/activemodel/CHANGELOG.md) for previous changes.
+Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-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 3c344fe854..cef5441e4a 100644
--- a/activemodel/lib/active_model/gem_version.rb
+++ b/activemodel/lib/active_model/gem_version.rb
@@ -7,10 +7,10 @@ module ActiveModel
end
module VERSION
- MAJOR = 5
- MINOR = 2
+ MAJOR = 6
+ MINOR = 0
TINY = 0
- PRE = "beta2"
+ PRE = "alpha"
STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
end