aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 15:22:05 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-03-26 15:22:05 -0700
commitdf37c91745a3fb241fafa23c03387e33eb82c74f (patch)
tree92b4cb9321a20d1ee03f32c982ac8f332b5469ee /activerecord/CHANGELOG.md
parentdbd26e92a7b943a57c2826a749ae25e3ce9e143c (diff)
parent8bd56f0f7ad2b48a50f12c49d436a469fdbb7135 (diff)
downloadrails-df37c91745a3fb241fafa23c03387e33eb82c74f.tar.gz
rails-df37c91745a3fb241fafa23c03387e33eb82c74f.tar.bz2
rails-df37c91745a3fb241fafa23c03387e33eb82c74f.zip
Merge pull request #9576 from fredwu/backport_fix_explicitly_inheraitance_column_to_3_2_stable
[Backport to 3-2-stable] Don't reset inheritance_column when setting explicitly.
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md5
1 files changed, 5 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index c0e0bb1dbc..9e6d44c8f0 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,10 @@
## unreleased ##
+* Do not reset `inheritance_column` when it's set explicitly.
+ Backport of #5327.
+
+ *kennyj + Fred Wu*
+
* Fix a problem wrong exception is occured
when raising no translatable exception in PostgreSQL.