aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/CHANGELOG.md
diff options
context:
space:
mode:
authorMark J. Titorenko <mark@titorenko.net>2018-11-29 18:36:20 +0000
committerMark J. Titorenko <mark@titorenko.net>2018-11-29 18:37:06 +0000
commit8212dfcf14c63c006b9e1c37595f3d62eab052cf (patch)
tree0b01f51e99b36d1eaa57b3d86d3217bf01f79357 /activesupport/CHANGELOG.md
parent4b5c4ca377a9b5c75d2c4b4d4f63f53866553b40 (diff)
downloadrails-8212dfcf14c63c006b9e1c37595f3d62eab052cf.tar.gz
rails-8212dfcf14c63c006b9e1c37595f3d62eab052cf.tar.bz2
rails-8212dfcf14c63c006b9e1c37595f3d62eab052cf.zip
Do nothing when the same block is included again.
If the same block is included multiple times, we no longer raise an exception or overwrite the included block instance variable. Fixes #14802. [Mark J. Titorenko + Vlad Bokov]
Diffstat (limited to 'activesupport/CHANGELOG.md')
-rw-r--r--activesupport/CHANGELOG.md4
1 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 98d232da33..ba8aaf47f9 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -1,3 +1,7 @@
+* If the same block is `included` multiple times for a Concern, an exception is no longer raised.
+
+ *Mark J. Titorenko*, *Vlad Bokov*
+
* Fix bug where `#to_options` for `ActiveSupport::HashWithIndifferentAccess`
would not act as alias for `#symbolize_keys`.