diff options
| author | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2011-03-30 20:56:05 -0500 |
| commit | 5df076ad0965dc684afff8a019fd9f92a53ada76 (patch) | |
| tree | b2272d3d7f0ed6713d888390a13b130c65aec6f3 /activerecord/lib/active_record/associations/has_one_association.rb | |
| parent | ac9443ed71bf0b40cf5b321e8e1b77b98abd9b5e (diff) | |
| parent | 9772de8d459960cc114c5b214343b7ce08fea21c (diff) | |
| download | rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.gz rails-5df076ad0965dc684afff8a019fd9f92a53ada76.tar.bz2 rails-5df076ad0965dc684afff8a019fd9f92a53ada76.zip | |
Merge branch 'master' into sprockets
Diffstat (limited to 'activerecord/lib/active_record/associations/has_one_association.rb')
| -rw-r--r-- | activerecord/lib/active_record/associations/has_one_association.rb | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/associations/has_one_association.rb b/activerecord/lib/active_record/associations/has_one_association.rb index e13f97125f..1d2e8667e4 100644 --- a/activerecord/lib/active_record/associations/has_one_association.rb +++ b/activerecord/lib/active_record/associations/has_one_association.rb @@ -39,14 +39,8 @@ module ActiveRecord end end - def association_scope - super.order(options[:order]) - end - private - alias creation_attributes construct_owner_attributes - # The reason that the save param for replace is false, if for create (not just build), # is because the setting of the foreign keys is actually handled by the scoping when # the record is instantiated, and so they are set straight away and do not need to be |