diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 12:40:34 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-06-09 12:40:34 -0300 |
| commit | 66eb847c9dc571421ca2d91bb7de23a788ecd76b (patch) | |
| tree | c0283d815f8c9c8c3cb89affb6bacd169632ba15 /activerecord | |
| parent | a5c12cbd3c0e9b392edb9e4eb13dcdd256327acd (diff) | |
| parent | 57a2c0d05900d6818f122e44308d611dbde86fa6 (diff) | |
| download | rails-66eb847c9dc571421ca2d91bb7de23a788ecd76b.tar.gz rails-66eb847c9dc571421ca2d91bb7de23a788ecd76b.tar.bz2 rails-66eb847c9dc571421ca2d91bb7de23a788ecd76b.zip | |
Merge pull request #15588 from thedarkone/remove-has-one-order-option
Remove a long gone :order option from has_one's valid_options
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record/associations/builder/has_one.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/builder/has_one.rb b/activerecord/lib/active_record/associations/builder/has_one.rb index f359efd496..a1f4f51664 100644 --- a/activerecord/lib/active_record/associations/builder/has_one.rb +++ b/activerecord/lib/active_record/associations/builder/has_one.rb @@ -5,7 +5,7 @@ module ActiveRecord::Associations::Builder end def valid_options - valid = super + [:order, :as] + valid = super + [:as] valid += [:through, :source, :source_type] if options[:through] valid end |