aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorMike Dillon <mike@embody.org>2013-05-16 11:11:27 -0700
committerMike Dillon <mike@embody.org>2013-05-16 11:28:31 -0700
commit2d7a86e17947e359cb65653b987c666b2d7e8efb (patch)
tree27c570e652cf25e6118b2894b6599b0dc81fb393 /activesupport/CHANGELOG.md
parentf96478369e0e01a00d1d6909814d388c49642b1a (diff)
downloadrails-2d7a86e17947e359cb65653b987c666b2d7e8efb.tar.gz
rails-2d7a86e17947e359cb65653b987c666b2d7e8efb.tar.bz2
rails-2d7a86e17947e359cb65653b987c666b2d7e8efb.zip
Raise when multiple included blocks are defined
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md6
1 files changed, 6 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 493c169803..1982811500 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,9 @@
+* Raise an error when multiple `included` blocks are defined for a Concern.
+ The old behavior would silently discard previously defined blocks, running
+ only the last one.
+
+ *Mike Dillon*
+
* Replace `multi_json` with `json`.
Since Rails requires Ruby 1.9 and since Ruby 1.9 includes `json` in the standard library,