aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-27 10:34:32 -0300
committerRafael Mendonça França <rafaelmfranca@gmail.com>2014-05-27 10:34:32 -0300
commit3067aee91fa4eaaa82a58a79d32c72fd9b9b3f51 (patch)
tree2dbd45d4f649c9864c5055afa0e70885b91ddaa7 /activerecord/CHANGELOG.md
parentcd5918f78c3e7ee60bcfda193c18666eb43871a7 (diff)
parent8570f9391d725afae1f3d60bfc5536afc46733b5 (diff)
downloadrails-3067aee91fa4eaaa82a58a79d32c72fd9b9b3f51.tar.gz
rails-3067aee91fa4eaaa82a58a79d32c72fd9b9b3f51.tar.bz2
rails-3067aee91fa4eaaa82a58a79d32c72fd9b9b3f51.zip
Merge pull request #15358 from arthurnn/redefine_habtm_fix
Fix redefine a has_and_belongs_to_many inside inherited class
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md8
1 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index d8157d02ab..736745c3cd 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,3 +1,11 @@
+* Fix redefine a has_and_belongs_to_many inside inherited class
+ Fixing regression case, where redefining the same has_an_belongs_to_many
+ definition into a subclass would raise.
+
+ Fixes #14983.
+
+ *arthurnn*
+
* Add a properties API to allow custom types and type casting behavior
to be specified. Will enable many edge cases to be deprecated, and
allow for additional interesting features in the future.