Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge pull request #5702 from oscardelben/patch-4" | Piotr Sarnacki | 2012-05-20 | 1 | -1/+3 |
| | | | | | | | This reverts commit cae1ca7d1be9c79c7ef012a1f62aef9d3bb815f8, reversing changes made to da97cf016a8ffd1f54f804cd881f393e5d6efc18. These changes break the build, it needs more investigation. | ||||
* | Merge pull request #5702 from oscardelben/patch-4 | Piotr Sarnacki | 2012-05-19 | 1 | -3/+1 |
|\ | | | | | Call undefine_attribute_methods only when defining new attributes | ||||
| * | Call undefine_attribute_methods only when defining new attributes | Oscar Del Ben | 2012-05-18 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #5678 from troyk/patch-1 | Carlos Antonio da Silva | 2012-05-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Remove sort on attributes.keys | ||||
| * | Remove sort on attributes.keys | Troy Kruthoff | 2012-03-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #6215 from erichmenge/fix_has_secure_password | Aaron Patterson | 2012-05-17 | 5 | -15/+43 |
|\ \ | | | | | | | Fix has secure password | ||||
| * | | Updated tests for has_secure_password. | Erich Menge | 2012-05-08 | 4 | -10/+33 |
| | | | |||||
| * | | has_secure_password shouldn't validate password_digest. It should also take ↵ | Erich Menge | 2012-05-08 | 1 | -5/+10 |
| | | | | | | | | | | | | options to turn validations off. | ||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-17 | 9 | -101/+154 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/core.rb | ||||
| * | | | fixing removed empty lines and examples | Francesco Rodriguez | 2012-05-16 | 8 | -6/+11 |
| | | | | |||||
| * | | | fixing validates_with docs | Francesco Rodriguez | 2012-05-16 | 1 | -6/+4 |
| | | | | |||||
| * | | | better format and fixes to validators docs | Francesco Rodriguez | 2012-05-16 | 8 | -104/+154 |
| | | | | |||||
| * | | | better example format in validates_exclusion_of docs | Francesco Rodriguez | 2012-05-16 | 1 | -2/+2 |
| | | | | |||||
* | | | | Improve logging of ActiveModel::MassAssignmentSecurity::Sanitizer | Naoto Takai | 2012-05-17 | 4 | -15/+28 |
| | | | | |||||
* | | | | Kill whitespaces :scissors: | Carlos Antonio da Silva | 2012-05-15 | 2 | -3/+3 |
| | | | | |||||
* | | | | Merge pull request #6284 from acapilleri/dup_validation | Carlos Antonio da Silva | 2012-05-15 | 2 | -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 Capilleri | 2012-05-13 | 2 | -0/+21 |
| | | | | | | | | | | | | | | | | Fixes #5953 | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-15 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/asset_tag_helper.rb | ||||
| * | | | | Missed colon | Alexey Vakhov | 2012-05-14 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | updating define_attribute_methods documentation | Francesco Rodriguez | 2012-05-14 | 3 | -3/+3 |
| | | | | |||||
* | | | | allow define_attribute_methods to pass multiple values | Francesco Rodriguez | 2012-05-14 | 2 | -13/+20 |
| | | | | |||||
* | | | | Merge pull request #5729 from oscardelben/use_tap | José Valim | 2012-05-13 | 1 | -5/+1 |
|\ \ \ \ | |/ / / |/| | | | Use the more idiomatic tap method | ||||
| * | | | Use the more idiomatic tap method | Oscar Del Ben | 2012-04-04 | 1 | -5/+1 |
| | | | | |||||
* | | | | Remove useless load path modifications | Santiago Pastorino | 2012-05-11 | 2 | -5/+0 |
| | | | | |||||
* | | | | Lazy load I18n | Santiago Pastorino | 2012-05-11 | 1 | -2/+3 |
| | | | | |||||
* | | | | Use respond_to?(:to_ary) rather than is_a?(Enumerable) to detect ↵ | Jon Leighton | 2012-05-11 | 4 | -3/+40 |
| |/ / |/| | | | | | | | | collection-thing. | ||||
* | | | simplify the alias_attribute example [ci skip] | Vijay Dev | 2012-05-08 | 1 | -20/+1 |
| | | | |||||
* | | | added docs to alias_attribute method | Francesco Rodriguez | 2012-05-07 | 1 | -0/+31 |
| | | | |||||
* | | | Revert "fixing active model links in readme" | Vijay Dev | 2012-05-07 | 1 | -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 readme | Francesco Rodriguez | 2012-05-07 | 1 | -3/+3 |
| | | | |||||
* | | | fixing marked actived model classes in readme | Francesco Rodriguez | 2012-05-07 | 1 | -3/+3 |
| | | | |||||
* | | | marking some active model classes | Francesco Rodriguez | 2012-05-07 | 1 | -3/+3 |
| | | | |||||
* | | | fixing active model links in readme | Francesco Rodriguez | 2012-05-07 | 1 | -10/+10 |
| | | | |||||
* | | | adding observer example | Francesco Rodriguez | 2012-05-07 | 1 | -0/+10 |
| | | | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-04 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix ActiveModel README example | Alexey Vakhov | 2012-05-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Rakefile executable attributes and shebang lines has been removed | Roman V. Babenko | 2012-05-02 | 1 | -0/+0 |
|/ / / | |||||
* | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-01 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Add line which gives a little bit more information how *_will_change! works. | Edward Tsech | 2012-05-01 | 1 | -0/+1 |
| | | | | |||||
* | | | | notify_observers should be public | Marc-Andre Lafortune | 2012-04-30 | 2 | -21/+27 |
| | | | | |||||
* | | | | Merge pull request #6063 from marcandre/observer_extra_args | Aaron Patterson | 2012-04-30 | 2 | -11/+26 |
|\ \ \ \ | | | | | | | | | | | Allow extra arguments for Observers | ||||
| * | | | | Allow extra arguments for Observers | Marc-Andre Lafortune | 2012-04-30 | 2 | -11/+26 |
| | | | | | |||||
* | | | | | build fix for observing_test.rb | Arun Agrawal | 2012-04-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | introduced here 17c990b153f8635874c006a7460ee95817543fc1 | ||||
* | | | | | Merge pull request #6072 from marcandre/observer_simplify_test | Santiago Pastorino | 2012-04-30 | 1 | -11/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | Observer: simplify tests | ||||
| * | | | | | Observer: simplify tests | Marc-Andre Lafortune | 2012-04-29 | 1 | -11/+4 |
| |/ / / / | |||||
* | | | | | Merge pull request #6071 from marcandre/observer_redef | Jeremy Kemper | 2012-04-29 | 2 | -3/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Observer by acting on singleton class. Fixes #3505. | ||||
| * | | | | | Fix Observer by acting on singleton class [#3505] | Marc-Andre Lafortune | 2012-04-29 | 2 | -3/+14 |
| |/ / / / | | | | | | | | | | | | | | | | Also [issue #1034] [pull #6068] | ||||
* | | | | | Merge pull request #5942 from ↵ | Aaron Patterson | 2012-04-29 | 7 | -11/+38 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute | ||||
| * | | | | | Support i18n attributes for confirmation | Brian Cardarella | 2012-04-24 | 3 | -3/+23 |
| | | | | | | |||||
| * | | | | | Reordered changelog entry | Brian Cardarella | 2012-04-23 | 1 | -2/+2 |
| | | | | | |