aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/CHANGELOG
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-041-1/+6
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/CHANGELOG activerecord/lib/active_record/association_preload.rb activerecord/lib/active_record/associations.rb activerecord/lib/active_record/associations/class_methods/join_dependency.rb activerecord/lib/active_record/associations/class_methods/join_dependency/join_association.rb activerecord/lib/active_record/associations/has_many_association.rb activerecord/lib/active_record/associations/has_many_through_association.rb activerecord/lib/active_record/associations/has_one_association.rb activerecord/lib/active_record/associations/has_one_through_association.rb activerecord/lib/active_record/associations/through_association_scope.rb activerecord/lib/active_record/reflection.rb activerecord/test/cases/associations/has_many_through_associations_test.rb activerecord/test/cases/associations/has_one_through_associations_test.rb activerecord/test/cases/reflection_test.rb activerecord/test/cases/relations_test.rb activerecord/test/fixtures/memberships.yml activerecord/test/models/categorization.rb activerecord/test/models/category.rb activerecord/test/models/member.rb activerecord/test/models/reference.rb activerecord/test/models/tagging.rb
| * Switch from SHA2 to BCrypt (easy Windows compatibility is coming shortly ↵David Heinemeier Hansson2010-12-181-1/+1
| | | | | | | | with new compiled gem)
| * Added ActiveRecord::Base#has_secure_password (via ↵David Heinemeier Hansson2010-12-181-1/+4
|/ | | | ActiveModel::SecurePassword) to encapsulate dead-simple password usage with SHA2 encryption and salting
* syncs CHANGELOGs for 3.0.2 in 3-0-stable with the ones in masterXavier Noria2010-11-091-0/+4
|
* Merge CHANGELOGs from 3-0-stableSantiago Pastorino2010-10-181-0/+3
|
* Update CHANGELOGs for 3.0 release and upcoming 3.1Jeremy Kemper2010-08-291-26/+6
|
* Clean up CHANGELOGsJeremy Kemper2010-08-281-0/+10
|
* Deletes trailing whitespaces (over text files only find * -type f -exec sed ↵Santiago Pastorino2010-08-141-1/+1
| | | | 's/[ \t]*$//' -i {} \;)
* Prep for RCDavid Heinemeier Hansson2010-07-261-1/+1
|
* Add missing entries and tidy up CHANGELOG.José Valim2010-07-191-0/+5
|
* Get ready for beta 4David Heinemeier Hansson2010-06-081-1/+1
|
* Active Model JSON serializer now supports custom root optionJatinder Singh2010-05-041-0/+5
| | | | | | [#4515 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Update changelogs for releaseDavid Heinemeier Hansson2010-04-131-0/+5
|
* Release is today, yoDavid Heinemeier Hansson2010-04-011-1/+2
|
* Updated changelogs to differentiate beta1 and beta2wycats2010-04-011-1/+3
|
* Updated changelogswycats2010-04-011-0/+12
|
* fixes doc generationXavier Noria2010-02-101-0/+11
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Change the ActiveModel::Base.include_root_in_json default to true for Rails ↵David Heinemeier Hansson2010-01-031-0/+2
| | | | 3 [DHH]
* Add validates_format_of :without => /regexp/ option [Elliot Winkler, Peer Allan]Elliot Winkler2009-08-101-0/+6
| | | | | | | | | | [#430 state:resolved] Example : validates_format_of :subdomain, :without => /www|admin|mail/ Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Introduce validates_with to encapsulate attribute validations in a class.Jeff Dean2009-08-091-0/+5
[#2630 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>