… Fixes issue #402.
…d security guide
This reverts commit 45c233e. Signed-off-by: Santiago Pastorino <email@example.com>
Signed-off-by: Santiago Pastorino <firstname.lastname@example.org>
Conflicts: activerecord/examples/performance.rb activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/nested_attributes.rb activerecord/test/cases/relations_test.rb
…timistic locking [#5505 state:resolved] Signed-off-by: Santiago Pastorino and José Ignacio Costa <email@example.com>
Signed-off-by: Santiago Pastorino and José Ignacio Costa <firstname.lastname@example.org>
Conflicts: activerecord/lib/active_record/associations/association_proxy.rb activerecord/lib/active_record/autosave_association.rb activerecord/lib/active_record/base.rb activerecord/lib/active_record/persistence.rb
- persisted? is the API defined in ActiveModel - makes it easier for extension libraries to conform to ActiveModel APIs without concern for whether the extended object is specifically ActiveRecord [#5927 state:committed] Signed-off-by: Santiago Pastorino <email@example.com>
…:resolved] Signed-off-by: José Valim <firstname.lastname@example.org>
…is not used anywhere else. Worse still, its use breaks some rdoc, replacing method names with a curly brace. Having just one call-seq directive doesn't add anything since this is covered by regular rdoc. Having multiple might make sense, but these are already documented with examples. This partly re-reverts 60de0e5 but does not touch the vendorized code in html-scanner.
…on column. [#5439 state:resolved] Signed-off-by: José Valim <email@example.com>
…n associated objects