aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel/lib/active_model
Commit message (Expand)AuthorAgeFilesLines
* 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-251-4/+4
|\ \ | |/ |/|
| * fix `alias_attribute` will raise a syntax error if make an alias on aayaya2012-05-141-4/+4
* | changed xml type datetime to dateTime, fixes #6328Angelo capilleri2012-05-231-1/+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-171-5/+10
|\ \ \
| * | | 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-172-10/+23
* | | | | Kill whitespaces :scissors:Carlos Antonio da Silva2012-05-151-2/+2
* | | | | Merge pull request #6284 from acapilleri/dup_validationCarlos Antonio da Silva2012-05-151-0/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | clean the erros if an object that includes validations errors is duped. Fixes...Angelo Capilleri2012-05-131-0/+6
* | | | | 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-141-1/+1
* | | | | allow define_attribute_methods to pass multiple valuesFrancesco Rodriguez2012-05-141-7/+7
* | | | | 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
* | | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect collection-t...Jon Leighton2012-05-112-3/+5
| |/ / / |/| | |
* | | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
* | | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| |_|/ |/| |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-011-0/+1
|\ \ \
| * | | Add line which gives a little bit more information how *_will_change! works.Edward Tsech2012-05-011-0/+1
* | | | notify_observers should be publicMarc-Andre Lafortune2012-04-301-19/+18
* | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-301-9/+17
|\ \ \ \
| * | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-301-9/+17
* | | | | Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-291-1/+1
|\ \ \ \ \
| * | | | | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-291-1/+1
| |/ / / /
* | | | | Merge pull request #5942 from bcardarella/confirmation_error_message_on_confi...Aaron Patterson2012-04-292-2/+3
|\ \ \ \ \
| * | | | | Support i18n attributes for confirmationBrian Cardarella2012-04-241-1/+2
| * | | | | confirmation validation error attributeBrian Cardarella2012-04-232-2/+2
* | | | | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-291-2/+3
* | | | | | Fix error message:Marc-Andre Lafortune2012-04-281-3/+3
| |/ / / / |/| | | |
* | | | | Refactor human attribute nameCarlos Antonio da Silva2012-04-282-7/+7
* | | | | Do not modify options hash in human_attribute_name, remove reverse_mergeCarlos Antonio da Silva2012-04-281-3/+2
* | | | | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactorJosé Valim2012-04-281-7/+7
|\ \ \ \ \
| * | | | | Refactor AMo::ErrorsCarlos Antonio da Silva2012-04-271-7/+7
| | |/ / / | |/| | |
* / | | | Return earlier if attribute already changed in *_will_change! methodsCarlos Antonio da Silva2012-04-271-1/+3
|/ / / /
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-283-6/+19
|\ \ \ \
| * | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+Mark Rushakof2012-04-271-1/+1
| * | | | minor docs improvementsOscar Del Ben2012-04-262-4/+4