aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--guides/source/4_1_release_notes.md5
1 files 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))