aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/CHANGELOG.md
diff options
context:
space:
mode:
authorSean Griffin <sean@seantheprogrammer.com>2018-01-23 14:08:46 -0700
committerSean Griffin <sean@seantheprogrammer.com>2018-01-23 14:12:13 -0700
commit0af36c62a5710e023402e37b019ad9982e69de4b (patch)
tree178cbe93ac6e6e2c489ac21a124c354e1300f20d /activemodel/CHANGELOG.md
parent6003dafc1f844275d6a7fe9e626eaeb1176c8e8a (diff)
downloadrails-0af36c62a5710e023402e37b019ad9982e69de4b.tar.gz
rails-0af36c62a5710e023402e37b019ad9982e69de4b.tar.bz2
rails-0af36c62a5710e023402e37b019ad9982e69de4b.zip
Allow attributes with a proc default to be marshalled
We don't implement much custom marshalling logic for these objects, but the proc default case needs to be handled separately. Unfortunately there's no way to just say "do what you would have done but with this value for one ivar", so we have to manually implement `marshal_load` as well. The test case is a little bit funky, but I'd really like an equality test in there, and there's no easy way to add one now that this is out of AR (since the `attributes` method isn't here) Fixes #31216
Diffstat (limited to 'activemodel/CHANGELOG.md')
-rw-r--r--activemodel/CHANGELOG.md7
1 files changed, 7 insertions, 0 deletions
diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md
index b67a803b9d..86353674d9 100644
--- a/activemodel/CHANGELOG.md
+++ b/activemodel/CHANGELOG.md
@@ -1,7 +1,14 @@
+* 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.