aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Expand)AuthorAgeFilesLines
...
* | Use default + merge! instead of reverse_mergeCarlos Antonio da Silva2012-06-261-1/+1
* | Set hash value instead of merge a single key, and use flatten! if possibleCarlos Antonio da Silva2012-06-262-4/+5
* | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-2510-19/+19
* | Make internal callback model definitions private in AMoCarlos Antonio da Silva2012-06-251-5/+7
* | add :nodoc: to internal implementations [ci skip]Francesco Rodriguez2012-06-224-4/+4
* | change param name to improve documentationFrancesco Rodriguez2012-06-221-2/+2
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-223-61/+133
|\
| * fixes a few mistakes in api docs [ci skip]Vijay Dev2012-06-222-2/+2
| * update ActiveModel::Callbacks documentation [ci skip]Francesco Rodriguez2012-06-221-24/+26
| * add description to ActiveModel::MissingAttributeError [ci skip]Francesco Rodriguez2012-06-211-1/+2
| * add example to ActiveModel::AttributeMethods#undefine_attribute_methods [ci s...Francesco Rodriguez2012-06-211-0/+26
| * add docs to AM::AttributeMethods#define_attribute_method [ci skip]Francesco Rodriguez2012-06-211-0/+25
| * fix ActiveModel::AttributeMethods#alias_attribute documentation [ci skip]Francesco Rodriguez2012-06-211-7/+20
| * update ActiveModel::AttributeMethods documentation [ci skip]Francesco Rodriguez2012-06-211-27/+20
| * add example to ActiveModel::Validations#validators [ci skip]Francesco Rodriguez2012-06-152-3/+15
* | Merge pull request #6800 from mschneider/dynamic_finders_for_aliased_attributesRafael Mendonça França2012-06-222-1/+12
|\ \
| * | made dynamic finders alias_attribute awareMaximilian Schneider2012-06-222-1/+12
* | | Add some coverage for AR serialization with serializable_hashCarlos Antonio da Silva2012-06-221-1/+1
* | | add :nodoc: to AM::AttributeMethods#instance_method_already_implemented? [ci ...Francesco Rodriguez2012-06-211-1/+1
* | | add :nodoc: to AM::AttributeMethods::AttributeMethodMatcher [ci skip]Francesco Rodriguez2012-06-211-1/+1
|/ /
* / 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