aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2010-08-04 14:11:09 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2010-08-04 14:11:30 -0700
commit30abb01d073a5cadf1e7f38e08ba20dfe468bda0 (patch)
tree221fdf8c8703994b980cf8317bfe4fd7478a6123 /activerecord/lib
parent84f0a0bc30df58e1edfd09fdde2de891e4577321 (diff)
downloadrails-30abb01d073a5cadf1e7f38e08ba20dfe468bda0.tar.gz
rails-30abb01d073a5cadf1e7f38e08ba20dfe468bda0.tar.bz2
rails-30abb01d073a5cadf1e7f38e08ba20dfe468bda0.zip
fisting indentation
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/relation/batches.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/relation/batches.rb b/activerecord/lib/active_record/relation/batches.rb
index 412be895c4..ecdf7c54b1 100644
--- a/activerecord/lib/active_record/relation/batches.rb
+++ b/activerecord/lib/active_record/relation/batches.rb
@@ -50,9 +50,9 @@ module ActiveRecord
def find_in_batches(options = {})
relation = self
- if orders.present? || taken.present?
- ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
- end
+ if orders.present? || taken.present?
+ ActiveRecord::Base.logger.warn("Scoped order and limit are ignored, it's forced to be batch order and batch size")
+ end
if (finder_options = options.except(:start, :batch_size)).present?
raise "You can't specify an order, it's forced to be #{batch_order}" if options[:order].present?