diff options
| author | Jon Leighton <j@jonathanleighton.com> | 2013-06-19 14:22:02 +0100 |
|---|---|---|
| committer | Jon Leighton <j@jonathanleighton.com> | 2013-06-19 14:22:02 +0100 |
| commit | e47b6dee858e62dceba867dd160b968d679c82e8 (patch) | |
| tree | c4c2226023f852026efbf744b1447a4133769e18 /activerecord/lib/active_record | |
| parent | b6a711f5f44d86554001ddd2ce52f19039073bd2 (diff) | |
| download | rails-e47b6dee858e62dceba867dd160b968d679c82e8.tar.gz rails-e47b6dee858e62dceba867dd160b968d679c82e8.tar.bz2 rails-e47b6dee858e62dceba867dd160b968d679c82e8.zip | |
Revert "Merge pull request #10566 from neerajdotname/10509d"
This reverts commit 2b817a5e89ac0e7aeb894a40ae7151a0cf3cef16, reversing
changes made to 353a398bee68c5ea99d76ac7601de0a5fef6f4a5.
Conflicts:
activerecord/CHANGELOG.md
Reason: the build broke
Diffstat (limited to 'activerecord/lib/active_record')
| -rw-r--r-- | activerecord/lib/active_record/associations/collection_association.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/collection_association.rb b/activerecord/lib/active_record/associations/collection_association.rb index 9833822f8f..efd7ecb97c 100644 --- a/activerecord/lib/active_record/associations/collection_association.rb +++ b/activerecord/lib/active_record/associations/collection_association.rb @@ -81,7 +81,7 @@ module ActiveRecord else if options[:finder_sql] find_by_scan(*args) - elsif options[:inverse_of] && loaded? + elsif options[:inverse_of] args = args.flatten raise RecordNotFound, "Couldn't find #{scope.klass.name} without an ID" if args.blank? |