aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib
Commit message (Expand)AuthorAgeFilesLines
* Add comments about bcrypt-ruby gem to SecurePasswordGuillermo Iguaran2011-09-031-0/+6
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-09-021-1/+1
|\
| * Fix typo in ActiveModel::Dirty comment. define_attribute_methods is a class m...Josh Nesbitt2011-09-021-1/+1
* | Remove hard dependency on bcrypt.Guillermo Iguaran2011-09-021-2/+3
|/
* Merge pull request #2563 from bogdan/internal_validationJosé Valim2011-08-2511-6/+42
|\
| * Typo fixBogdan Gusiev2011-08-251-1/+1
| * Implemented strict validation conceptBogdan Gusiev2011-08-1711-6/+42
* | added missing require array/wrap in serializationAnand2011-08-231-0/+2
|/
* Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-161-1/+1
|\
| * fix misleading comment (originally made by Tate Johnson, we lost this commit ...Vijay Dev2011-08-141-1/+1
* | Merge branch 'master' of github.com:lifo/docrailsXavier Noria2011-08-131-1/+1
|\|
| * Fixed typoTate Johnson2011-08-131-1/+1
| * MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-08-131-0/+5
| * Rename new method to_path to to_partial_path to avoid conflicts with File#to_...José Valim2011-08-133-10/+10
| * Rename class method to_path to _to_path and make it explicit that it is an in...José Valim2011-08-131-3/+5
| * Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-08-133-5/+39
| * Handle the empty array correctly.thedarkone2011-08-131-1/+1
* | Allow ActiveRecord observers to be disabled.Myron Marston2011-08-121-2/+2
* | Merge pull request #2385 from bogdan/test_default_sanitizer2José Valim2011-08-011-0/+5
|\ \
| * | MassAssignmentProtection: consider 'id' insensetive in StrictSanitizerBogdan Gusiev2011-07-281-0/+5
* | | Rename new method to_path to to_partial_path to avoid conflicts with File#to_...José Valim2011-08-013-10/+10
* | | 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-283-5/+39
|\ \ \
| * | | Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-253-5/+39
| |/ /
* | | Merge pull request #2305 from thedarkone/errors-includeSantiago Pastorino2011-07-271-1/+1
|\ \ \ | |_|/ |/| |
| * | Handle the empty array correctly.thedarkone2011-07-271-1/+1
| |/
* / Fix example code for #validates_with instance methodBen Marini2011-07-241-2/+2
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-231-1/+1
|\
| * 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-182-9/+77
|\ \
| * | ActiveModel support for the :include serialization optionJohn Firebaugh2011-07-172-1/+72
| * | Replace map+compact with selectJohn Firebaugh2011-07-171-1/+1
| * | serializable_hash(:only => [], :methods => [:foo]) should workJohn Firebaugh2011-07-171-7/+4
| |/
* | 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-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