Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #5843 from ↵ | José Valim | 2012-05-29 | 2 | -2/+7 |
|\ | | | | | | | | | kuroda/translation_of_deeply_nested_model_attributes Fix human attribute_name to handle deeply nested attributes | ||||
| * | Fix human attribute_name to handle deeply nested attributes | Tsutomu Kuroda | 2012-05-16 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | When a model nests another model that also nests yet another model using accepts_nested_attributes_for method, its Errors object can have an attribute name with "contacts.addresses.street" style. In this case, the dots within the namespace should be substituted with slashes so that we can provide the translation under the "activemodel.attributes.person/contacts/addresses.street" key. This commit is related to #3859. | ||||
* | | Don't enable validations when passing false hash values to ActiveModel.validates | Steve Purcell | 2012-05-28 | 3 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing a falsey option value for a validator currently causes that validator to be enabled, just like "true": ActiveModel.validates :foo, :presence => false This is rather counterintuitive, and makes it inconvenient to wrap `validates` in methods which may conditionally enable different validators. As an example, one is currently forced to write: def has_slug(source_field, options={:unique => true}) slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? } before_validation slugger validations = { :presence => true, :slug => true } if options[:unique] validations[:uniqueness] = true end validates :slug, validations end because the following reasonable-looking alternative fails to work as expected: def has_slug(source_field, options={:unique => true}) slugger = Proc.new { |r| r[:slug] = self.class.sluggify(r[source_field]) if r[:slug].blank? } before_validation slugger validates :slug, :presence => true, :slug => true, :uniqueness => options[:unique] end (This commit includes a test, and all activemodel and activerecord tests pass as before.) | ||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-05-26 | 1 | -2/+2 |
|\ \ | |||||
| * | | Add comment for attr_accessible/attr_protected :as option. [ci skip] | Edward Tsech | 2012-05-25 | 1 | -2/+2 |
| | | | |||||
* | | | Merge pull request #4785 from ↵ | José Valim | 2012-05-25 | 2 | -4/+26 |
|\ \ \ | |/ / |/| | | | | | | | | ayamomiji/add-self-to-allow-method-name-using-ruby-keyword add `self.` to allow method name using ruby keyword | ||||
| * | | fix `alias_attribute` will raise a syntax error if make an alias on a | ayaya | 2012-05-14 | 2 | -4/+26 |
| | | | | | | | | | | | | column that named as a ruby keyword | ||||
* | | | Add license field to gemspecs, by Matt Griffin | Matt Griffin | 2012-05-23 | 1 | -0/+1 |
| | | | |||||
* | | | changed xml type datetime to dateTime, fixes #6328 | Angelo capilleri | 2012-05-23 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 |
| | | | |