aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
* Remove blank trailing commentsHenrik Hodne2012-05-2012-17/+0
| | | | | | | For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilà! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
* Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ | | | | Remove sort on attributes.keys
| * 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
|\ \ | | | | | | Fix has secure password
| * | 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
| | | | | | | | | | | | options to turn validations off.
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-179-101/+154
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb
| * | | 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 validation is duped.
| * | | clean the erros if an object that includes validations errors is duped. ↵Angelo Capilleri2012-05-132-0/+21
| | | | | | | | | | | | | | | | Fixes #5953
* | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb
| * | | | 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 method
| * | | 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 ↵Jon Leighton2012-05-114-3/+40
| |/ / |/| | | | | | | | collection-thing.
* | | simplify the alias_attribute example [ci skip]Vijay Dev2012-05-081-20/+1
| | |
* | | added docs to alias_attribute methodFrancesco Rodriguez2012-05-071-0/+31
| | |
* | | Revert "fixing active model links in readme"Vijay Dev2012-05-071-10/+10
| | | | | | | | | | | | | | | | | | | | | This reverts commit c962680e1902d2c9474f0be8ba7b0b8ab361cae6. Reason: The links must be relative to work in both edge and stable api sites.
* | | removing the surrounding +s in active model readmeFrancesco Rodriguez2012-05-071-3/+3
| | |
* | | fixing marked actived model classes in readmeFrancesco Rodriguez2012-05-071-3/+3
| | |
* | | marking some active model classesFrancesco Rodriguez2012-05-071-3/+3
| | |
* | | fixing active model links in readmeFrancesco Rodriguez2012-05-071-10/+10
| | |
* | | adding observer exampleFrancesco Rodriguez2012-05-071-0/+10
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-05-041-1/+1
|\ \ \
| * | | Fix ActiveModel README exampleAlexey Vakhov2012-05-041-1/+1
| | | |
* | | | Rakefile executable attributes and shebang lines has been removedRoman V. Babenko2012-05-021-0/+0
|/ / /
* | | 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-302-21/+27
| | | |
* | | | Merge pull request #6063 from marcandre/observer_extra_argsAaron Patterson2012-04-302-11/+26
|\ \ \ \ | | | | | | | | | | Allow extra arguments for Observers
| * | | | Allow extra arguments for ObserversMarc-Andre Lafortune2012-04-302-11/+26
| | | | |
* | | | | build fix for observing_test.rbArun Agrawal2012-04-301-1/+1
| | | | | | | | | | | | | | | introduced here 17c990b153f8635874c006a7460ee95817543fc1
* | | | | Merge pull request #6072 from marcandre/observer_simplify_testSantiago Pastorino2012-04-301-11/+4
|\ \ \ \ \ | | | | | | | | | | | | Observer: simplify tests
| * | | | | 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. Fixes #3505.
| * | | | | Fix Observer by acting on singleton class [#3505]Marc-Andre Lafortune2012-04-292-3/+14
| |/ / / / | | | | | | | | | | | | | | | Also [issue #1034] [pull #6068]
* | | | | Merge pull request #5942 from ↵Aaron Patterson2012-04-297-11/+38
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will render the error message on :#{attribute}_confirmation instead of on attribute itself. When rendering confirmation errors inline on the form with form builders such as SimpleForm and Formtastic it is confusing to the ender user to see the confirmation error message on the attribute element. Instead it makes more sense to have this validation error render on the confirmation field instead. The i18n message has been updated for the confirmation validator error message to include the original attribute name.