aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder/singular_association.rb
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 19:28:32 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-12-11 19:28:32 -0200
commit7a036ebd30a6333f22684bdd33dcf5ad4d101d26 (patch)
treea49115491e36ea6a9b3862d3bd0c70d996534e35 /activerecord/lib/active_record/associations/builder/singular_association.rb
parent5853c64a4ba77134b7a4ff942b7ae711cb7bcc46 (diff)
downloadrails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.tar.gz
rails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.tar.bz2
rails-7a036ebd30a6333f22684bdd33dcf5ad4d101d26.zip
Revert the whole refactoring in the association builder classes.
This is to get activerecord-deprecated_finders work again
Diffstat (limited to 'activerecord/lib/active_record/associations/builder/singular_association.rb')
-rw-r--r--activerecord/lib/active_record/associations/builder/singular_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/singular_association.rb b/activerecord/lib/active_record/associations/builder/singular_association.rb
index 6a1a0073e6..e655c389a6 100644
--- a/activerecord/lib/active_record/associations/builder/singular_association.rb
+++ b/activerecord/lib/active_record/associations/builder/singular_association.rb
@@ -2,7 +2,7 @@
module ActiveRecord::Associations::Builder
class SingularAssociation < Association #:nodoc:
- def self.build_valid_options(options)
+ def valid_options
super + [:remote, :dependent, :primary_key, :inverse_of]
end