Label only accepts `:index` and `:namespace` attributes from the input

1 files changed, 25 insertions, 0 deletions

diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 9e58c193b1..b95ef0e478 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -1,3 +1,28 @@
+*   Label tags generated by collection helpers only inherit the `:index` and
+    `:namespace` from the input, because only these attributes modifies the
+    `for` attribute of the label. Also, the input attributes don't have
+    precedence over the label attributes anymore.
+
+    Before:
+
+        collection = [[1, true, { class: 'foo' }]]
+        f.collection_check_boxes :options, collection, :second, :first do |b|
+          b.label(class: 'my_custom_class')
+        end
+
+        # => <label class="foo" for="user_active_true">1</label>
+
+    After:
+
+        collection = [[1, true, { class: 'foo' }]]
+        f.collection_check_boxes :options, collection, :second, :first do |b|
+          b.label(class: 'my_custom_class')
+        end
+
+        # => <label class="my_custom_class" for="user_active_true">1</label>
+
+    *Andriel Nuernberg*
+
 *   Fixed a long-standing bug in `json_escape` that causes quotation marks to be stripped.
     This method also escapes the \u2028 and \u2029 unicode newline characters which are
     treated as \n in JavaScript. This matches the behaviour of the AS::JSON encoder. (The