Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | changed xml type datetime to dateTime, fixes #6328 | Angelo capilleri | 2012-05-23 | 1 | -1/+1 |
| | | | | | | | | | XmlMini define the xml 'datatime', but according to http://www.w3.org/TR/xmlschema-2/#dateTime could be better change this to 'dateTime' with upper case letter 'T. So 'DateTime' and 'Time' are redefined from 'datetime' to 'dateTime' add the changing to the changelog | ||||
* | Fix the build | Santiago Pastorino | 2012-05-22 | 1 | -1/+0 |
| | |||||
* | require active_support/lazy_load_hooks where is needed | Santiago Pastorino | 2012-05-22 | 1 | -0/+1 |
| | |||||
* | 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 | 1 | -5/+10 |
|\ \ | | | | | | | Fix has secure password | ||||
| * | | 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 | 2 | -10/+23 |
| | | | | |||||
* | | | | Kill whitespaces :scissors: | Carlos Antonio da Silva | 2012-05-15 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge pull request #6284 from acapilleri/dup_validation | Carlos Antonio da Silva | 2012-05-15 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| | | | 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 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | | |||||
* | | | | allow define_attribute_methods to pass multiple values | Francesco Rodriguez | 2012-05-14 | 1 | -7/+7 |
| | | | | |||||
* | | | | 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 | 1 | -2/+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 | 2 | -3/+5 |
| |/ / |/| | | | | | | | | 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 |
| | | | |||||
* | | | 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 | 1 | -19/+18 |
| | | | | |||||
* | | | | Merge pull request #6063 from marcandre/observer_extra_args | Aaron Patterson | 2012-04-30 | 1 | -9/+17 |
|\ \ \ \ | | | | | | | | | | | Allow extra arguments for Observers | ||||
| * | | | | Allow extra arguments for Observers | Marc-Andre Lafortune | 2012-04-30 | 1 | -9/+17 |
| | | | | | |||||
* | | | | | Merge pull request #6071 from marcandre/observer_redef | Jeremy Kemper | 2012-04-29 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix Observer by acting on singleton class. Fixes #3505. | ||||
| * | | | | | Fix Observer by acting on singleton class [#3505] | Marc-Andre Lafortune | 2012-04-29 | 1 | -1/+1 |
| |/ / / / | | | | | | | | | | | | | | | | Also [issue #1034] [pull #6068] | ||||
* | | | | | Merge pull request #5942 from ↵ | Aaron Patterson | 2012-04-29 | 2 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | bcardarella/confirmation_error_message_on_confirmation_attribute confirmation validation error attribute | ||||
| * | | | | | Support i18n attributes for confirmation | Brian Cardarella | 2012-04-24 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | confirmation validation error attribute | Brian Cardarella | 2012-04-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | | Generate appropriate error more judiciously | Marc-Andre Lafortune | 2012-04-29 | 1 | -2/+3 |
| | | | | | | |||||
* | | | | | | Fix error message: | Marc-Andre Lafortune | 2012-04-28 | 1 | -3/+3 |
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | - can pass the class, not the instance - "instance method" is confusing, use "method :instance" instead | ||||
* | | | | | Refactor human attribute name | Carlos Antonio da Silva | 2012-04-28 | 2 | -7/+7 |
| | | | | | |||||
* | | | | | Do not modify options hash in human_attribute_name, remove reverse_merge | Carlos Antonio da Silva | 2012-04-28 | 1 | -3/+2 |
| | | | | | |||||
* | | | | | Merge pull request #6025 from carlosantoniodasilva/amo-errors-refactor | José Valim | 2012-04-28 | 1 | -7/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor AMo::Errors | ||||
| * | | | | | Refactor AMo::Errors | Carlos Antonio da Silva | 2012-04-27 | 1 | -7/+7 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | * Use merge!, remove reverse_merge * Use case statement instead of is_a? checks | ||||
* / | | | | Return earlier if attribute already changed in *_will_change! methods | Carlos Antonio da Silva | 2012-04-27 | 1 | -1/+3 |
|/ / / / | | | | | | | | | | | | | Avoid obtaining the value and duplicating it when possible. | ||||
* | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-04-28 | 3 | -6/+19 |
|\ \ \ \ | |||||
| * | | | | Use <tt>Foo::Bar</tt> instead of +Foo::Bar+ | Mark Rushakof | 2012-04-27 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter doesn't render as code in HTML output. Regex used in Rubymine to locate the latter form: (\+)(:*\w+:(?::|\w)+)(\+) | ||||
| * | | | | minor docs improvements | Oscar Del Ben | 2012-04-26 | 2 | -4/+4 |
| | | | | |