aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 23:15:54 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-09-22 23:15:54 +0000
commit0b2e059f0a7bcd27ea96e92ad19a35f36344ed6b (patch)
tree6b328f7a47774c4de64d2fa10460c17280c3091a /activerecord
parent953de118db423fe678b5e4c55209f0fcd0b53bbf (diff)
downloadrails-0b2e059f0a7bcd27ea96e92ad19a35f36344ed6b.tar.gz
rails-0b2e059f0a7bcd27ea96e92ad19a35f36344ed6b.tar.bz2
rails-0b2e059f0a7bcd27ea96e92ad19a35f36344ed6b.zip
Removed unnecessary or statement (closes #7158) [richcollins]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7583 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/association_proxy.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/association_proxy.rb b/activerecord/lib/active_record/associations/association_proxy.rb
index d2478fc84e..32810c91e0 100644
--- a/activerecord/lib/active_record/associations/association_proxy.rb
+++ b/activerecord/lib/active_record/associations/association_proxy.rb
@@ -79,7 +79,7 @@ module ActiveRecord
protected
def dependent?
- @reflection.options[:dependent] || false
+ @reflection.options[:dependent]
end
def quoted_record_ids(records)