From 7f648bc70e76b7a386a41f882ddd97105334f590 Mon Sep 17 00:00:00 2001 From: Yves Senn Date: Thu, 6 Feb 2014 12:18:46 +0100 Subject: docs, Associations also raise on name conflicts. [ci skip] Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470 --- guides/source/4_1_release_notes.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guides/source/4_1_release_notes.md b/guides/source/4_1_release_notes.md index 170b071df8..90e6b2fcbc 100644 --- a/guides/source/4_1_release_notes.md +++ b/guides/source/4_1_release_notes.md @@ -525,8 +525,9 @@ for detailed changes. return an `Enumerator` that can calculate its size. ([Pull Request](https://github.com/rails/rails/pull/13938)) -* `scope` and `endum` now raise on "dangerous" name - conflicts. ([Pull Request](https://github.com/rails/rails/pull/13450)) +* `scope`, `enum` and Associations now raise on "dangerous" name + conflicts. ([Pull Request](https://github.com/rails/rails/pull/13450), + [Pull Request](https://github.com/rails/rails/pull/13896)) * `second` through `fifth` methods act like the `first` finder. ([Pull Request](https://github.com/rails/rails/pull/13757)) -- cgit v1.2.3