aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into nested_has_many_throughJon Leighton2011-03-0446-163/+543
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Revert "Properly interpolate i18n keys in modules [#5572 state:resolved]"Santiago Pastorino2011-02-275-37/+8
| | | | | | | | | | | | | | This breaks #6448, you should use :"module/class" as key for namespacing [#6448 state:committed] This reverts commit 8d30193b08bd2321a7a78a1f481bd5e4d4d45557.
| * failing test for i18n key collision with namespaced modelsSantiago Pastorino2011-02-272-0/+11
| |
| * We're in 2011, let's update our licensePrem Sichanugrist2011-02-222-2/+2
| | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-2111-12/+52
| |\
| | * copy-edits 8d96b89Xavier Noria2011-02-219-11/+26
| | |
| | * copy-edits 6d7a826Xavier Noria2011-02-211-3/+3
| | |
| | * copy-edits 34316d8Xavier Noria2011-02-211-7/+5
| | |
| | * Docs: Update to_xml documentation to match as_json docuemntationNicholas Rowe2011-02-201-0/+25
| | |
| | * Documentation: Added small comments to Observering moduleNicholas Rowe2011-02-201-0/+3
| | |
| | * Clarification of ActiveRecord ActiveModel validation documentationPeer Allan2011-02-187-9/+8
| | |
| * | documents the backported Range#cover?, and related stuffXavier Noria2011-02-201-3/+5
| | |
| * | refactored ActiveModel::Validations::InclusionValidator#validate_eachDiego Carrion2011-02-191-18/+8
| |/ | | | | | | | | | | [#6455 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * merges docrailsXavier Noria2011-02-182-1/+5
| |\
| | * fix type: remove extra periodNicholas Rowe2011-02-171-1/+1
| | |
| | * add note about observer config for rails appsJimmy Cuadra2011-02-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Observer and ActiveRecord::Observer have similar documentation, but a Rails user looking at the ActiveModel version might not realize that a change to config/application.rb is required to activate the observer. This change adds a note to that effect, pointing to the AR version from the AM version.
| * | Change validates inclusion to use cover? for Ranges in ruby 1.9 [#6453 ↵Frederick Cheung2011-02-182-3/+29
| | | | | | | | | | | | | | | | | | state:committed] Signed-off-by: Xavier Noria <fxn@hashref.com>
| * | Override attributes_protected_by_default when has_secure_password is called.Tsutomu Kuroda2011-02-094-2/+38
| | | | | | | | | | | | | | | | | | | | | attr_protected should not be called, because it nullifies the mass assignment protection that has been set by attr_accessible. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | implementing include? on AM::ErrorsAaron Patterson2011-02-092-0/+11
| | |
| * | we do not need message to be an arrayAaron Patterson2011-02-091-9/+8
| | |
| * | use map rather than array concatenationAaron Patterson2011-02-091-9/+4
| | |
| * | favor composition over inheritenceAaron Patterson2011-02-091-9/+33
| | |
| * | use 1 call to concat rather than calling << n timesAaron Patterson2011-02-091-4/+4
| | |
| * | Use map + flatten hereSantiago Pastorino2011-02-071-3/+3
| | |
| * | Fixed broken, memoized attributes method exampleNathaniel Bibler2011-02-071-2/+2
| | | | | | | | | | | | | | | | | | [#6245 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | Find all validators for multiple attributesCarl Lerche2011-02-052-2/+22
| | |
| * | Optionally pass in the attribute being validated to an instance method validatorCarl Lerche2011-02-053-1/+20
| | |
| * | Be able to pass a validator method to #validatesCarl Lerche2011-02-053-0/+22
| | |
| * | Provide a way to specify alternate option keys for validatesCarl Lerche2011-02-053-1/+22
| | |
| * | Do not require that validation attributes be specified as symbolsCarl Lerche2011-02-052-2/+12
| |/
| * module_eval is not needed hereSantiago Pastorino2011-02-031-5/+3
| |
| * method_defined?, define_method and send accepts a string as argumentSantiago Pastorino2011-02-031-6/+6
| |
| * allow spaces and other characters in attribute names [#4725 state:resolved]Caleb Land2011-02-032-4/+34
| | | | | | | | | | | | | | | | * define the dynamically defined methods with 'define_method' instead of def * wrap some string injected method names in quotes Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-02-021-1/+1
| |\
| | * Deleted extra "a" in method commentPaul Yoder2011-01-271-1/+1
| | |
| * | Use run_callbacks; the generated _run_<name>_callbacks method is not a ↵John Firebaugh2011-01-315-9/+6
| | | | | | | | | | | | | | | | | | public interface. Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
| * | psych does not emit a space after the tagAaron Patterson2011-01-211-1/+1
| |/
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-01-202-22/+26
| |\
| | * Properly indent code example blockDaniel Schierbeck2011-01-151-19/+19
| | |
| | * Remove reference to ActiveRecord from ActiveModel commentsbrainopia2011-01-151-3/+7
| | |
| | * Revert "Update CHANGELOGs to include 3.0.3 changes"Xavier Noria2011-01-021-6/+1
| | | | | | | | | | | | | | | | | | | | | Reason: Sorry, CHANGELOGs can only be edited in master. If you provide a patch I'll apply it myself. Thanks! This reverts commit 1f8ecb85d7c1b3efdf45c3cf3461502b608c1a7c.
| | * Update CHANGELOGs to include 3.0.3 changesPrem Sichanugrist2011-01-021-1/+6
| | |
| * | sorry, the CI cannot lie to us anymore (Part II)Santiago Pastorino2011-01-131-1/+1
| | |
| * | Bump up bcrypt-ruby dependency to 2.1.4Santiago Pastorino2011-01-091-2/+1
| | |
| * | fix difference between behaviour of blank and emptyHemant Kumar2011-01-052-1/+7
| |/ | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com>
| * Instance methods shouldnt be added until you actually call has_secure_passwordDavid Heinemeier Hansson2010-12-291-11/+15
| |
| * No need to symbolize these.José Valim2010-12-272-2/+2
| |
| * define_attr_method must serialize nil correctlyAaron Patterson2010-12-201-1/+1
| |
| * Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2010-12-202-5/+5
| |\
| | * minor fixesin READMEsVijay Dev2010-12-201-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-03 23:24:21 +0000