aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6072 from marcandre/observer_simplify_testSantiago Pastorino2012-04-301-11/+4
|\
| * Observer: simplify testsMarc-Andre Lafortune2012-04-291-11/+4
* | Merge pull request #6071 from marcandre/observer_redefJeremy Kemper2012-04-292-3/+14
|\ \
| * | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-292-3/+14
| |/
* | Merge pull request #5942 from bcardarella/confirmation_error_message_on_confi...Aaron Patterson2012-04-297-11/+38
|\ \
| * | Support i18n attributes for confirmationBrian Cardarella2012-04-243-3/+23
| * | Reordered changelog entryBrian Cardarella2012-04-231-2/+2
| * | Updated CHANGELOGBrian Cardarella2012-04-231-0/+2
| * | confirmation validation error attributeBrian Cardarella2012-04-236-11/+16
* | | Generate appropriate error more judiciouslyMarc-Andre Lafortune2012-04-292-2/+18
* | | 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-282-5/+10
* | 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
| * | Add documentation for validate optionsOscar Del Ben2012-04-261-0/+13
| * | Enhance validations documentationOscar Del Ben2012-04-261-1/+1
* | | Merge pull request #5878 from oscardelben/refactor_observed_classVijay Dev2012-04-251-5/+2
|\ \ \ | |/ / |/| |
| * | Refactor Observer.observed_classOscar Del Ben2012-04-251-5/+2
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-253-10/+14
|\ \ \
| * | | fix code syntaxOscar Del Ben2012-04-251-2/+2
| * | | Add include documentation to serializationOscar Del Ben2012-04-251-1/+6
| * | | improve serialization docOscar Del Ben2012-04-251-4/+5
| * | | Correct documentation of SecurePasswordOscar Del Ben2012-04-241-1/+2
| * | | Fixed expected value in comment. Removed duplicate lines in example.Bernard Kroes2012-04-211-4/+1
| | |/ | |/|
* | | Minor refactor of serializable hashOscar Del Ben2012-04-251-2/+1
| |/ |/|
* | Merge pull request #5841 from oscardelben/rename_count_observersJosé Valim2012-04-242-2/+9
|\ \
| * | Rename Observing#count_observers to Observing#observers_countOscar Del Ben2012-04-142-2/+9
* | | Merge pull request #5966 from oscardelben/fix_secure_password_setterJosé Valim2012-04-242-1/+7
|\ \ \
| * | | Fix secure_password setterOscar Del Ben2012-04-242-1/+7
| | |/ | |/|
* / | Refactor SecurePassword#authenticateOscar Del Ben2012-04-241-5/+1
|/ /
* | Improve observers documentationOscar Del Ben2012-04-181-0/+2
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-183-11/+12
|\ \
| * | Fix confusing example in ActiveModel::ErrorsThibaut Courouble2012-04-171-2/+2
| * | fix ActiveModel::Validations::Callbacks docJan Xie2012-04-151-1/+2
| * | fix bad format [ci skip]Michael de Silva2012-04-141-7/+7
| * | Improve example in initializerOscar Del Ben2012-04-141-1/+1
| |/
* / Rename notify_observers argument *arg to *args to make it more clearOscar Del Ben2012-04-141-2/+2
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-04-121-3/+3
|\
| * fix bad format [ci skip]Vijay Dev2012-04-111-1/+1
| * Fix small markup error; fix incorrect linkJonathan Mazin2012-04-091-2/+2
* | Merge pull request #5736 from oscardelben/configuration_errors_reportingJon Leighton2012-04-111-3/+3
|\ \ | |/ |/|
| * Add better errors reporting for ActiveModel::ConfigurationOscar Del Ben2012-04-041-3/+3
* | Updated/changed useless tr/gsubsJurriaan Pruis2012-04-031-1/+1
|/
* Don't include deprecation in AM::Naming anymoreGrant Hutchins2012-03-311-1/+0
* Merge pull request #4904 from ask4prasath/refactor_dirty_module_with_helperJosé Valim2012-03-281-1/+2
|\