aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib/active_record/associations
diff options
context:
space:
mode:
authorJon Leighton <j@jonathanleighton.com>2011-03-16 18:54:51 +0000
committerJon Leighton <j@jonathanleighton.com>2011-03-16 18:54:51 +0000
commit8aaf3c1e553d18b40d9980951d496bffad56f37b (patch)
tree2eddd2b50a5924420b30caa5c6d867f4870a71dc /activerecord/lib/active_record/associations
parent9abc94c44516afdcfe4a3b202c336c9578fd6d0d (diff)
parent0eae62525696b57fe7fc4bbb0bf9c0bc7ee4e480 (diff)
downloadrails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.gz
rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.tar.bz2
rails-8aaf3c1e553d18b40d9980951d496bffad56f37b.zip
Merge branch 'master' into nested_has_many_through
Diffstat (limited to 'activerecord/lib/active_record/associations')
-rw-r--r--activerecord/lib/active_record/associations/singular_association.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations/singular_association.rb b/activerecord/lib/active_record/associations/singular_association.rb
index 0d8e45adb5..4edbe216be 100644
--- a/activerecord/lib/active_record/associations/singular_association.rb
+++ b/activerecord/lib/active_record/associations/singular_association.rb
@@ -37,7 +37,7 @@ module ActiveRecord
# Implemented by subclasses
def replace(record)
- raise NotImplementedError
+ raise NotImplementedError, "Subclasses must implement a replace(record) method"
end
def set_new_record(record)