aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations/builder
diff options
context:
space:
mode:
authorthedarkone <thedarkone2@gmail.com>2014-06-09 16:29:41 +0200
committerthedarkone <thedarkone2@gmail.com>2014-06-09 16:29:41 +0200
commit57a2c0d05900d6818f122e44308d611dbde86fa6 (patch)
treec0283d815f8c9c8c3cb89affb6bacd169632ba15 /activerecord/lib/active_record/associations/builder
parenta5c12cbd3c0e9b392edb9e4eb13dcdd256327acd (diff)
downloadrails-57a2c0d05900d6818f122e44308d611dbde86fa6.tar.gz
rails-57a2c0d05900d6818f122e44308d611dbde86fa6.tar.bz2
rails-57a2c0d05900d6818f122e44308d611dbde86fa6.zip
Remove a long gone :order option from has_one's valid_options.
Diffstat (limited to 'activerecord/lib/active_record/associations/builder')
-rw-r--r--activerecord/lib/active_record/associations/builder/has_one.rb2
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