aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Expand)AuthorAgeFilesLines
* Enable passing root: false to #to_jsonJoe Fiorini2011-07-011-5/+17
* Master version is 3.2.0.betaSantiago Pastorino2011-06-301-2/+2
* changing an attribute multiple times retains the correct original valueIan Stewart2011-06-281-1/+1
* 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-231-2/+8
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-181-1/+1
|\
| * Remove trailing whitespacesGuillermo Iguaran2011-06-121-1/+1
* | Get rid of the alternate namespace lookup.José Valim2011-06-112-7/+5
|/
* Brought back alternative convention for namespaced models in i18n.thoefer2011-06-082-5/+7
* 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
* | Transform the symbol into a constant lookup.José Valim2011-05-312-25/+28
* | ActiveModel::MassAssignmentSecurity.mass_assignment_sanitizer methodBogdan Gusiev2011-05-302-7/+35
* | Merge pull request #1334 from bogdan/callbackJosé Valim2011-05-263-14/+32
|\ \ | |/ |/|
| * MassAssignmentSecurity: add ability to specify your own sanitizerBogdan Gusiev2011-05-263-14/+32
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-2513-24/+24
|\ \ | |/ |/|
| * Remove extra white spaces on ActiveModel docs.Sebastian Martinez2011-05-2313-24/+24
* | Remove superfluous whitespace from ActiveModel::SecurePassword Daniel Schierbeck2011-05-221-1/+1
* | Bump versions for rc1David Heinemeier Hansson2011-05-211-1/+1
* | ActionMailer deliver method Documentation corrected Ticket #761Ganesh Kumar2011-05-211-1/+1
* | Specify the name to be used for ActiveModel::Name fixes #1168Yves Senn2011-05-201-2/+3
* | Prefer each instead of for inGuillermo Iguaran2011-05-191-3/+1
|/
* Attributes with :string type should not be given the type passed in model ser...Jim Herzberg2011-05-181-1/+1
* Remove unneeded merge with default false optionsAkira Matsuda2011-05-161-4/+0
* Don't add DEFAULT_TOKENIZER to every instance of LengthValidator. Just use it...Akira Matsuda2011-05-161-2/+2
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-4/+4
|\
| * Improve doc styles for ActiveModel::ConversionSebastian Martinez2011-05-041-4/+4
* | Methods that return nil should not be considered YAMLJoshua Wehner2011-05-101-0/+1
* | renamed mass-assignment scopes to roles, updated code, tests, docs and securi...Josh Kalderimis2011-05-081-23/+23
* | Add documentation for new observer enable/disable feature.Myron Marston2011-05-062-3/+51
* | Prepare for beta1David Heinemeier Hansson2011-05-041-1/+1
|/
* Improved ActiveModel Observing docs.Sebastian Martinez2011-04-301-2/+4
* Merge branch 'master' of github.com:lifo/docrailsDan Pickett2011-04-293-4/+4
|\
| * Rephrased Dirty#changed? docsSebastian Martinez2011-04-261-1/+1
| * Removed extra whitespaceSebastian Martinez2011-04-261-1/+1
| * Better formatting on ActiveModel::TranslationSebastian Martinez2011-04-261-2/+2
* | fix typoAditya Sanghi2011-04-291-1/+1
* | :if should not fire on validations when not in context with :onAditya Sanghi2011-04-292-3/+3
* | Fix bug with AM::Observer disablement.Myron Marston2011-04-282-25/+17
* | Fix dev env memory leaks by using AS::DescendantsTracker rather than keeping ...Myron Marston2011-04-282-36/+12
* | Revert "Revert "Handle enabling/disabling observers at different levels of th...Myron Marston2011-04-282-3/+36
* | Revert "Handle enabling/disabling observers at different levels of the class ...José Valim2011-04-282-36/+3
* | Handle enabling/disabling observers at different levels of the class hierarchy.Myron Marston2011-04-282-3/+36