aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Expand)AuthorAgeFilesLines
* AM::Validations: remove documentation duplicatesBogdan Gusiev2012-07-109-119/+52
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-07-0713-152/+199
|\
| * add :nodoc: to internal implementations of AM::Validator [ci skip]Francesco Rodriguez2012-07-062-3/+3
| * update ActiveModel::Serialization documentation [ci skip]Francesco Rodriguez2012-07-061-14/+36
| * fix syntax of AM::Validations::HelperMethods examples [ci skip]Francesco Rodriguez2012-07-054-6/+6
| * update ActiveModel::Validations::HelperMethods documentation [ci skip]Francesco Rodriguez2012-07-058-130/+141
| * update ActiveModel::Conversion documentation [ci skip]Francesco Rodriguez2012-07-041-3/+15
| * Changed attr_accessible example to reflect grouped rolesLaknath2012-07-011-2/+4
* | Merge pull request #6938 from acapilleri/as_json_refactoringCarlos Antonio da Silva2012-07-071-2/+6
|\ \
| * | small refactoring of as_json methodAngelo Capilleri2012-07-031-2/+6
| |/
* / observer update refactoringAngelo Capilleri2012-07-031-2/+1
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-306-118/+357
|\
| * update ActiveModel::Name documentation [ci skip]Francesco Rodriguez2012-06-251-1/+133
| * fix punctuation in activemodel/errors [ci skip]Francesco Rodriguez2012-06-251-1/+1
| * update ActiveModel::Naming documentationFrancesco Rodriguez2012-06-231-7/+8
| * update ActiveModel::Model documentation [ci skip]Francesco Rodriguez2012-06-231-16/+37
| * add description ActiveModel::StrictValidationField [ci skip]Francesco Rodriguez2012-06-231-0/+10
| * update ActiveModel::Lint documentation [ci skip]Francesco Rodriguez2012-06-221-22/+23
| * update ActiveModel::Errors#include? documentation [ci skip]Francesco Rodriguez2012-06-221-1/+1
| * add documentation and examples to ActiveModel::Errors [ci skip]Francesco Rodriguez2012-06-221-4/+26
| * update ActiveModel::Errors documentation and minor fixes [ci skip]Francesco Rodriguez2012-06-223-64/+103
| * update ActiveModel::Conversion documentation [ci skip]Francesco Rodriguez2012-06-221-8/+21
* | Refactor attribute method matcher to use Hash#fetchCarlos Antonio da Silva2012-06-261-5/+3
* | Cleanup attribute methods a bit, use map! when accepting *argsCarlos Antonio da Silva2012-06-261-17/+12
* | 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-221-1/+3
|\ \
| * | made dynamic finders alias_attribute awareMaximilian Schneider2012-06-221-1/+3
* | | 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-155-147/+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-141-3/+20
* | Merge pull request #6668 from pomnikita/masterPiotr Sarnacki2012-06-081-1/+1
|\ \
| * | Compact array of values added to PermissionSet instanceNikita Pomyashchiy2012-06-081-1/+1
| |/