aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/relation.rb
diff options
context:
space:
mode:
authorPratik Naik <pratiknaik@gmail.com>2009-12-26 03:50:57 +0530
committerPratik Naik <pratiknaik@gmail.com>2009-12-26 03:50:57 +0530
commit95274b28d95ad85ada25eb0c697ce5650ae488a9 (patch)
tree8ea9d7fc169413a163d782ef8fdd5b5b57ad8a3a /activerecord/lib/active_record/relation.rb
parent1a993371805122cf50531b95651c6933d568080e (diff)
downloadrails-95274b28d95ad85ada25eb0c697ce5650ae488a9.tar.gz
rails-95274b28d95ad85ada25eb0c697ce5650ae488a9.tar.bz2
rails-95274b28d95ad85ada25eb0c697ce5650ae488a9.zip
Rename Model.conditions and relation.conditions to .where
Diffstat (limited to 'activerecord/lib/active_record/relation.rb')
-rw-r--r--activerecord/lib/active_record/relation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/relation.rb b/activerecord/lib/active_record/relation.rb
index 28f04e5d85..6cc2befdf3 100644
--- a/activerecord/lib/active_record/relation.rb
+++ b/activerecord/lib/active_record/relation.rb
@@ -100,7 +100,7 @@ module ActiveRecord
end
end
- def conditions(conditions)
+ def where(conditions)
if conditions.blank?
self
else