aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-10 15:15:30 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-02-10 15:15:30 -0200
commitf926c1c953df6037654732c57a6c6b23db91c9fa (patch)
tree2321afce521133968c8f569f4d371405d9eeeff7 /activerecord/lib
parent2f8c596d1beb46acd8a74f0e6d5c1c48a29dcee9 (diff)
parent577a7c6dd16470b901a73b426978ad5e46b613ba (diff)
downloadrails-f926c1c953df6037654732c57a6c6b23db91c9fa.tar.gz
rails-f926c1c953df6037654732c57a6c6b23db91c9fa.tar.bz2
rails-f926c1c953df6037654732c57a6c6b23db91c9fa.zip
Merge pull request #18860 from alex-handley/enhancement/dependent_documentation_fix
Documentation Fix: Corrects explanation of what happens when dependent is not set
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 81a42e22f3..5a3b4f0c40 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -1014,7 +1014,7 @@ module ActiveRecord
# record(s) being removed so that callbacks are run. However <tt>delete</tt> and <tt>delete_all</tt> will either
# do the deletion according to the strategy specified by the <tt>:dependent</tt> option, or
# if no <tt>:dependent</tt> option is given, then it will follow the default strategy.
- # The default strategy is <tt>:nullify</tt> (set the foreign keys to <tt>nil</tt>), except for
+ # The default strategy is to do nothing (leave the foreign keys with the parent ids set), except for
# +has_many+ <tt>:through</tt>, where the default strategy is <tt>delete_all</tt> (delete
# the join records, without running their callbacks).
#