aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-29 10:26:32 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-29 10:26:32 -0700
commit324ff46d36d19abeff7f9f5e83bc3a17fa9369bb (patch)
tree7c89f803d4201d96f9d6453e4d2d7457da48d045 /activerecord/lib
parentf7b40166b2e5ad8845c9b9c81681b450ddd672dc (diff)
parent915b6b3929bad242632bdef455154156ca25064c (diff)
downloadrails-324ff46d36d19abeff7f9f5e83bc3a17fa9369bb.tar.gz
rails-324ff46d36d19abeff7f9f5e83bc3a17fa9369bb.tar.bz2
rails-324ff46d36d19abeff7f9f5e83bc3a17fa9369bb.zip
Merge pull request #7188 from rodrigoflores/master
Documentation Fix: Pointing the case when no dependent option is given to a association method
Diffstat (limited to 'activerecord/lib')
-rw-r--r--activerecord/lib/active_record/associations.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index 05715feb97..edf82eb170 100644
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -941,7 +941,8 @@ module ActiveRecord
#
# The <tt>:dependent</tt> option can have different values which specify how the deletion
# is done. For more information, see the documentation for this option on the different
- # specific association types.
+ # specific association types. When no option is given, the behaviour is to do nothing
+ # with the associated records when destroying a record.
#
# === Delete or destroy?
#