aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorFred Wu <ifredwu@gmail.com>2013-03-27 09:20:04 +1100
committerFred Wu <ifredwu@gmail.com>2013-03-27 09:20:04 +1100
commit8bd56f0f7ad2b48a50f12c49d436a469fdbb7135 (patch)
tree92b4cb9321a20d1ee03f32c982ac8f332b5469ee /activerecord
parent55e295470303a6abcf152f24a1a8c7864dab5ef6 (diff)
downloadrails-8bd56f0f7ad2b48a50f12c49d436a469fdbb7135.tar.gz
rails-8bd56f0f7ad2b48a50f12c49d436a469fdbb7135.tar.bz2
rails-8bd56f0f7ad2b48a50f12c49d436a469fdbb7135.zip
Added changelog for 55e2954
Diffstat (limited to 'activerecord')
-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.