aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/4_1_release_notes.md
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-02-06 12:18:46 +0100
committerYves Senn <yves.senn@gmail.com>2014-02-06 12:18:46 +0100
commit7f648bc70e76b7a386a41f882ddd97105334f590 (patch)
tree6ddcd18f011a8829c65c163f93dfcbaa6018126a /guides/source/4_1_release_notes.md
parent580f0b61dc99c6854fa930a761d28a3ab08163f7 (diff)
downloadrails-7f648bc70e76b7a386a41f882ddd97105334f590.tar.gz
rails-7f648bc70e76b7a386a41f882ddd97105334f590.tar.bz2
rails-7f648bc70e76b7a386a41f882ddd97105334f590.zip
docs, Associations also raise on name conflicts. [ci skip]
Follow up to https://github.com/rails/rails/commit/580f0b61dc99c6854fa930a761d28a3ab08163f7#commitcomment-5293470
Diffstat (limited to 'guides/source/4_1_release_notes.md')
-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))