aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/CHANGELOG.md
diff options
context:
space:
mode:
authorMarc-Andre Lafortune <github@marc-andre.ca>2014-01-29 15:42:07 -0500
committerMarc-Andre Lafortune <github@marc-andre.ca>2014-02-05 16:53:02 -0500
commit13d2696c10726afecd393753fcac88c5a9907d8c (patch)
tree9a505cd8dc1a66b1afbf04e324fb6597c7563f20 /activerecord/CHANGELOG.md
parentd37f395be86d131d0218dadd189771f99b06874f (diff)
downloadrails-13d2696c10726afecd393753fcac88c5a9907d8c.tar.gz
rails-13d2696c10726afecd393753fcac88c5a9907d8c.tar.bz2
rails-13d2696c10726afecd393753fcac88c5a9907d8c.zip
Return sized enumerator from Batches#find_each
Diffstat (limited to 'activerecord/CHANGELOG.md')
-rw-r--r--activerecord/CHANGELOG.md8
1 files changed, 7 insertions, 1 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 4bc31457c0..af723c61bd 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,4 +1,10 @@
-* `find_in_batches` now returns an `Enumerator` that can calculate its size.
+<<<<<<< HEAD
+* `find_in_batches`, `find_each` now
+ return an `Enumerator` that can calculate its size.
+=======
+* `find_in_batches`, `find_each`, `Result#each` now returns an `Enumerator`
+ that can calculate its size.
+>>>>>>> 5863938... Return sized enumerator from Result#each
See also #13938.