aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-23 14:37:05 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-06-23 14:37:05 -0300
commit679626e4e151e9a05d64a9898674fb6fd04a55bf (patch)
tree924c3dc57271745ac7f72063af683639b469681c /activerecord/CHANGELOG.md
parentc73f97b0ee2464a400d8b3a892de65687e883d4a (diff)
parentae96f229f6501d8635811d6b22d75d43cdb880a4 (diff)
downloadrails-679626e4e151e9a05d64a9898674fb6fd04a55bf.tar.gz
rails-679626e4e151e9a05d64a9898674fb6fd04a55bf.tar.bz2
rails-679626e4e151e9a05d64a9898674fb6fd04a55bf.zip
Merge pull request #15878 from sgrif/sg-null-column
Revert #15502, and add a deprecation warning instead.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c87565452d..33dec99ec7 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -117,7 +117,8 @@
*Lauro Caetano*, *Carlos Antonio da Silva*
-* Return a null column from `column_for_attribute` when no column exists.
+* Deprecate returning `nil` from `column_for_attribute` when no column exists.
+ It will return a null object in Rails 5.0
*Sean Griffin*