aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-10-03 15:06:11 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-10-03 15:06:11 -0700
commit4c0f023ea3d3361df21d020597cba049ee7da6aa (patch)
treed589f6d807c1900074f4b0abbb02e5da994ebe80 /activerecord
parent8a4ea4a4a5808ed27eeb5a4c91c12707f75ba0fc (diff)
downloadrails-4c0f023ea3d3361df21d020597cba049ee7da6aa.tar.gz
rails-4c0f023ea3d3361df21d020597cba049ee7da6aa.tar.bz2
rails-4c0f023ea3d3361df21d020597cba049ee7da6aa.zip
parent is always passed in, so make it non-optional
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/lib/active_record/associations/join_dependency/join_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/join_dependency/join_association.rb b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
index b488c64642..d97c1972f7 100644
--- a/activerecord/lib/active_record/associations/join_dependency/join_association.rb
+++ b/activerecord/lib/active_record/associations/join_dependency/join_association.rb
@@ -29,7 +29,7 @@ module ActiveRecord
delegate :options, :through_reflection, :source_reflection, :chain, :to => :reflection
delegate :alias_tracker, :to => :join_dependency
- def initialize(reflection, join_dependency, parent = nil)
+ def initialize(reflection, join_dependency, parent)
reflection.check_validity!
if reflection.options[:polymorphic]