diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-11 01:05:14 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-10-11 01:05:14 +0530 |
| commit | f638ef951b4d185b2bfd3d0d8be241cb23001890 (patch) | |
| tree | 6fc5b981d4e8cc148ff5a63d6a753804247db375 /activerecord/lib/active_record/relation/batches.rb | |
| parent | 3401d5089ba4802b6554483a4de7739e6f914e50 (diff) | |
| parent | 26ec070b09ceb798b471fd6999ae1da319120899 (diff) | |
| download | rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.tar.gz rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.tar.bz2 rails-f638ef951b4d185b2bfd3d0d8be241cb23001890.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
activerecord/lib/active_record/persistence.rb
railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
Diffstat (limited to 'activerecord/lib/active_record/relation/batches.rb')
| -rw-r--r-- | activerecord/lib/active_record/relation/batches.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb index 28aab6d92b..8af0c6a8ef 100644 --- a/activerecord/lib/active_record/relation/batches.rb +++ b/activerecord/lib/active_record/relation/batches.rb @@ -40,7 +40,7 @@ module ActiveRecord # # It's not possible to set the order. That is automatically set to # ascending on the primary key ("id ASC") to make the batch ordering - # work. This also mean that this method only works with integer-based + # work. This also means that this method only works with integer-based # primary keys. You can't set the limit either, that's used to control # the batch sizes. # |