aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Expand)AuthorAgeFilesLines
* Simplify AR configuration code.Jon Leighton2012-06-157-302/+8
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-143-10/+13
|\
| * Range#cover? is not implemented in AS nowAkira Matsuda2012-06-122-4/+3
| * Make observer enable/disable documentation more informative. Robb Kidd2012-06-091-6/+10
* | prevent users from unknowingly using bad regexps that can compromise security...MrBrdo2012-06-144-9/+41
* | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-082-1/+7
|\ \
| * | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-082-1/+7
| |/
* / change AMS::JSON.include_root_in_json default value to falseFrancesco Rodriguez2012-06-063-94/+111
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-021-24/+35
|\
| * update ActiveModel::Dirty documentationFrancesco Rodriguez2012-05-311-24/+35
* | Sync CHANGLOG with the 3-2-stable branchRafael Mendonça França2012-06-011-0/+15
|/
* Merge pull request #5843 from kuroda/translation_of_deeply_nested_model_attri...José Valim2012-05-292-2/+7
|\
| * Fix human attribute_name to handle deeply nested attributesTsutomu Kuroda2012-05-162-2/+7
* | Don't enable validations when passing false hash values to ActiveModel.validatesSteve Purcell2012-05-283-0/+8
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-261-2/+2
|\ \
| * | Add comment for attr_accessible/attr_protected :as option. [ci skip]Edward Tsech2012-05-251-2/+2
* | | Merge pull request #4785 from ayamomiji/add-self-to-allow-method-name-using-r...José Valim2012-05-252-4/+26
|\ \ \ | |/ / |/| |
| * | fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-142-4/+26
* | | Add license field to gemspecs, by Matt GriffinMatt Griffin2012-05-231-0/+1
* | | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-232-2/+2
* | | Fix the buildSantiago Pastorino2012-05-221-1/+0
* | | require active_support/lazy_load_hooks where is neededSantiago Pastorino2012-05-221-0/+1
* | | Revert "Merge pull request #5702 from oscardelben/patch-4"Piotr Sarnacki2012-05-201-1/+3
* | | Merge pull request #5702 from oscardelben/patch-4Piotr Sarnacki2012-05-191-3/+1
|\ \ \
| * | | Call undefine_attribute_methods only when defining new attributesOscar Del Ben2012-05-181-3/+1
* | | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
* | | | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-175-15/+43
|\ \ \ \
| * | | | Updated tests for has_secure_password.Erich Menge2012-05-084-10/+33
| * | | | has_secure_password shouldn't validate password_digest. It should also take ...Erich Menge2012-05-081-5/+10
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-179-101/+154
|\ \ \ \ \
| * | | | | fixing removed empty lines and examplesFrancesco Rodriguez2012-05-168-6/+11
| * | | | | fixing validates_with docsFrancesco Rodriguez2012-05-161-6/+4
| * | | | | better format and fixes to validators docsFrancesco Rodriguez2012-05-168-104/+154
| * | | | | better example format in validates_exclusion_of docsFrancesco Rodriguez2012-05-161-2/+2
* | | | | | Improve logging of ActiveModel::MassAssignmentSecurity::SanitizerNaoto Takai2012-05-174-15/+28
| |_|_|_|/ |/| | | |
* | | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-152-3/+3
* | | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-152-0/+21
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | clean the erros if an object that includes validations errors is duped. Fixes...Angelo Capilleri2012-05-132-0/+21
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-1/+1
|\ \ \ \ \
| * | | | | Missed colonAlexey Vakhov2012-05-141-1/+1
| |/ / / /
* | | | | updating define_attribute_methods documentationFrancesco Rodriguez2012-05-143-3/+3
* | | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-142-13/+20
* | | | | Merge pull request #5729 from oscardelben/use_tapJosé Valim2012-05-131-5/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use the more idiomatic tap methodOscar Del Ben2012-04-041-5/+1
* | | | | Remove useless load path modificationsSantiago Pastorino2012-05-112-5/+0
* | | | | Lazy load I18nSantiago Pastorino2012-05-111-2/+3
* | | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect collection-t...Jon Leighton2012-05-114-3/+40
| |/ / / |/| | |
* | | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
* | | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31