aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorVijay Dev <vijaydev.cse@gmail.com>2011-12-16 23:34:00 +0530
committerVijay Dev <vijaydev.cse@gmail.com>2011-12-16 23:34:00 +0530
commitbd84b2bb5db0a1ecdde8517a03458a82700de05d (patch)
tree2e6704058658b881a06d5510e1ce767fae46146c /activerecord/lib
parentf307f4d884be7d0dcef60df4636dbda7155b499d (diff)
parentbdcc27155dd08a4abbb8ba1ca07b767a5d8d3416 (diff)
downloadrails-bd84b2bb5db0a1ecdde8517a03458a82700de05d.tar.gz
rails-bd84b2bb5db0a1ecdde8517a03458a82700de05d.tar.bz2
rails-bd84b2bb5db0a1ecdde8517a03458a82700de05d.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/reflection.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/reflection.rb b/activerecord/lib/active_record/reflection.rb
index f8a2de0f7e..794a0526fb 100644
--- a/activerecord/lib/active_record/reflection.rb
+++ b/activerecord/lib/active_record/reflection.rb
@@ -461,7 +461,7 @@ module ActiveRecord
source_reflection.source_macro
end
- # A through association is nested iff there would be more than one join table
+ # A through association is nested if there would be more than one join table
def nested?
chain.length > 2 || through_reflection.macro == :has_and_belongs_to_many
end