diff options
| author | Marc-Andre Lafortune <github@marc-andre.ca> | 2014-02-04 02:18:03 -0500 |
|---|---|---|
| committer | Marc-Andre Lafortune <github@marc-andre.ca> | 2014-02-05 16:53:58 -0500 |
| commit | a476020567a47f5fbec3629707d5bf31b400a284 (patch) | |
| tree | 49ab417231c91102b3b878aaaf10285f1a465785 /activerecord | |
| parent | 13d2696c10726afecd393753fcac88c5a9907d8c (diff) | |
| download | rails-a476020567a47f5fbec3629707d5bf31b400a284.tar.gz rails-a476020567a47f5fbec3629707d5bf31b400a284.tar.bz2 rails-a476020567a47f5fbec3629707d5bf31b400a284.zip | |
Return sized enumerator from Enumerable#index_by
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/CHANGELOG.md | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index af723c61bd..f1d51b9de1 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -1,10 +1,5 @@ -<<<<<<< HEAD -* `find_in_batches`, `find_each` now +* `find_in_batches`, `find_each`, `Result#each` and `Enumerable#index_by` 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. |