diff options
author | eileencodes <eileencodes@gmail.com> | 2019-03-13 13:11:10 -0400 |
---|---|---|
committer | eileencodes <eileencodes@gmail.com> | 2019-03-13 13:11:10 -0400 |
commit | a2bd669ed240bec739074188d61ff125e07fa8d1 (patch) | |
tree | f16681562c906e3a8881d010e252b0a3a1dfe5ae /activemodel | |
parent | 1dc4d49f517e5cea99063afd9692b201199484ef (diff) | |
parent | 7c87fd5635fd830905e17d3cbf1eb2a2215acedf (diff) | |
download | rails-a2bd669ed240bec739074188d61ff125e07fa8d1.tar.gz rails-a2bd669ed240bec739074188d61ff125e07fa8d1.tar.bz2 rails-a2bd669ed240bec739074188d61ff125e07fa8d1.zip |
Merge tag 'v6.0.0.beta3'
v6.0.0.beta3 release
Diffstat (limited to 'activemodel')
-rw-r--r-- | activemodel/CHANGELOG.md | 18 | ||||
-rw-r--r-- | activemodel/lib/active_model/gem_version.rb | 2 |
2 files changed, 13 insertions, 7 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 71e56e2522..56fbfacbd7 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -1,26 +1,32 @@ * Change how validation error translation strings are fetched: The new behavior will first try the more specific keys, including doing locale fallback, then try the less specific ones. - + For example, this is the order in which keys will now be tried for a `blank` error on a `product`'s `title` attribute with current locale set to `en-US`: - + en-US.activerecord.errors.models.product.attributes.title.blank en-US.activerecord.errors.models.product.blank en-US.activerecord.errors.messages.blank - + en.activerecord.errors.models.product.attributes.title.blank en.activerecord.errors.models.product.blank en.activerecord.errors.messages.blank - + en-US.errors.attributes.title.blank en-US.errors.messages.blank - + en.errors.attributes.title.blank en.errors.messages.blank - + *Hugo Vacher* + +## Rails 6.0.0.beta3 (March 11, 2019) ## + +* No changes. + + ## Rails 6.0.0.beta2 (February 25, 2019) ## * Fix date value when casting a multiparameter date hash to not convert diff --git a/activemodel/lib/active_model/gem_version.rb b/activemodel/lib/active_model/gem_version.rb index 399e724cea..1626aac468 100644 --- a/activemodel/lib/active_model/gem_version.rb +++ b/activemodel/lib/active_model/gem_version.rb @@ -10,7 +10,7 @@ module ActiveModel MAJOR = 6 MINOR = 0 TINY = 0 - PRE = "beta2" + PRE = "beta3" STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".") end |