diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-16 17:51:03 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-07-16 17:51:03 -0300 |
| commit | 6feb2aa6bd3b342a73ced32888f6fd1b039639c0 (patch) | |
| tree | c658f07dab7171150512f02371287047f58528b3 | |
| parent | 0a5be1da2f9e3ce7e8c5d922c3685928e6ce224f (diff) | |
| parent | bdd4d9f20c39951772f2c8a65442f3bf70217803 (diff) | |
| download | rails-6feb2aa6bd3b342a73ced32888f6fd1b039639c0.tar.gz rails-6feb2aa6bd3b342a73ced32888f6fd1b039639c0.tar.bz2 rails-6feb2aa6bd3b342a73ced32888f6fd1b039639c0.zip | |
Merge pull request #16197 from cgriego/patch-1
Remove unused 1:1 association :remote option
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/singular_association.rb | 2 |
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 17f36acf40..6e6dd7204c 100644 --- a/activerecord/lib/active_record/associations/builder/singular_association.rb +++ b/activerecord/lib/active_record/associations/builder/singular_association.rb @@ -3,7 +3,7 @@ module ActiveRecord::Associations::Builder class SingularAssociation < Association #:nodoc: def valid_options - super + [:remote, :dependent, :primary_key, :inverse_of, :required] + super + [:dependent, :primary_key, :inverse_of, :required] end def self.define_accessors(model, reflection) |