aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2385 from bogdan/test_default_sanitizer2José Valim2011-08-012-1/+14
|\
| * MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-07-282-1/+14
* | Rename new method to_path to to_partial_path to avoid conflicts with File#to_...José Valim2011-08-016-18/+18
* | Give attribution to Peter Jaros for the patch we paired on.Grant Hutchins2011-07-281-1/+1
* | Update CHANGELOG.José Valim2011-07-281-0/+2
* | Rename class method to_path to _to_path and make it explicit that it is an in...José Valim2011-07-281-3/+5
* | Merge pull request #2034 from Casecommons/to_pathJosé Valim2011-07-286-10/+62
|\ \
| * | Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-256-10/+62
| |/
* | Merge pull request #2305 from thedarkone/errors-includeSantiago Pastorino2011-07-272-1/+2
|\ \
| * | Handle the empty array correctly.thedarkone2011-07-272-1/+2
| |/
* / Fix example code for #validates_with instance methodBen Marini2011-07-241-2/+2
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-232-1/+28
|\
| * fixed typeVishnu Atrai2011-07-211-1/+1
| * Download and installation, License and Support sections added for activemodelBratish Goswami2011-07-211-0/+27
| * Documentation fix: adding missing equal sign in code sample for ActiveModel::...Sebastian Gassner2011-07-201-1/+1
* | Merge pull request #195 from bigfix/active_model_include_serializationJosé Valim2011-07-184-17/+209
|\ \
| * | ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-174-9/+189
| * | Replace map+compact with selectJohn Firebaugh2011-07-171-1/+1
| * | Add a testJohn Firebaugh2011-07-171-0/+5
| * | serializable_hash(:only => [], :methods => [:foo]) should workJohn Firebaugh2011-07-172-7/+14
| |/
* | Made attribute_method_matchers_cache private + docLawrence Pit2011-07-171-3/+13
* | Issue #2075 Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-161-9/+17
* | Optimization of ActiveModel's match_attribute_method?Lawrence Pit2011-07-151-2/+5
|/
* Enable passing root: false to #to_jsonJoe Fiorini2011-07-012-6/+69
* Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
* changing an attribute multiple times retains the correct original valueIan Stewart2011-06-282-1/+10
* Minor formating fixAlexander Uvarov2011-06-241-2/+2
* Follow rails convention by using Array.wrapAlexander Uvarov2011-06-231-2/+3
* Allow to specify mass-assignment roles as arrayAlexander Uvarov2011-06-233-3/+31
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-181-1/+1
|\
| * Remove trailing whitespacesGuillermo Iguaran2011-06-121-1/+1
* | Merge pull request #1654 from ganeshkumar/test_casesSantiago Pastorino2011-06-131-1/+0
|\ \
| * | removed duplicate codeganesh2011-06-111-1/+0
| |/
* | Update CHANGELOG.José Valim2011-06-111-0/+3
* | Get rid of the alternate namespace lookup.José Valim2011-06-113-17/+5
|/
* Brought back alternative convention for namespaced models in i18n.thoefer2011-06-083-5/+17
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-064-16/+16
|\
| * fix incorrect outputVijay Dev2011-06-041-1/+1
| * use clearer variable name in examplesVijay Dev2011-06-042-12/+12
| * remove stray (Vijay Dev2011-06-031-1/+1
| * Change hashrocket spacing to match conventions.Ben Orenstein2011-06-021-2/+2
* | Don't add .rb in requiresGuillermo Iguaran2011-05-312-2/+2
* | no need for .rbDamien Mathieu2011-05-311-1/+1
* | string inflections are needed for running tests in isolationDamien Mathieu2011-05-311-0/+1
* | Update CHANGELOG.José Valim2011-05-311-0/+2
* | Transform the symbol into a constant lookup.José Valim2011-05-313-29/+32
* | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-303-12/+48
* | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-267-39/+57
|\ \ | |/ |/|
| * MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-267-39/+57
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2513-24/+24
|\ \ | |/ |/|