Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 1 | -1/+1 | |
|\ | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb | |||||
| * | Revert "Fix Example in active model attribute methods" | Vijay Dev | 2012-10-11 | 1 | -1/+1 | |
| | | | | | | | | This reverts commit 1c02b988641c201308e6b3de6457128878e47bd5. | |||||
| * | Revert "Fix all examples in comments in active_model attribute methods" | Vijay Dev | 2012-10-11 | 1 | -6/+6 | |
| | | | | | | | | This reverts commit 93b1ca8bd34993f8958219f13c195f5acf8e55f6. | |||||
| * | Use a 1.9 Hash syntax in README files (fixes thanks to @vijaydev) | Robin Dupret | 2012-10-10 | 1 | -1/+1 | |
| | | ||||||
| * | Fix all examples in comments in active_model attribute methods | Nick Rowe | 2012-10-02 | 1 | -6/+6 | |
| | | ||||||
| * | Fix Example in active model attribute methods | Nick Rowe | 2012-10-02 | 1 | -1/+1 | |
| | | ||||||
* | | Use the `flat_map` method. | Rafael Mendonça França | 2012-10-03 | 1 | -2/+2 | |
| | | | | | | | | Thanks to @jeremy to teach me this one. | |||||
* | | Revert "Merge pull request #7826 from sikachu/master-validators-kind" | Rafael Mendonça França | 2012-10-02 | 3 | -32/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4e9f53f9736544f070e75e516c71137b7eb49a7a, reversing changes made to 6b802cdb4f5b84e1bf49aaeb0e994b3be6028af9. Revert "Don't use tap in this case." This reverts commit 454d820bf0a18fe1db4c55b0145197d70fef1f82. Reason: Is not a good idea to add options to this method since we can do the same thing using method composition. Person.validators_on(:name).select { |v| v.kind == :presence } Also it avoids to change the method again to add more options. | |||||
* | | Don't use tap in this case. | Rafael Mendonça França | 2012-10-02 | 1 | -5/+7 | |
| | | | | | | | | | | The use of tap in this case is very confusing since we are mutating the return value inside the block | |||||
* | | Make `.validators_on` accept `:kind` option | Prem Sichanugrist | 2012-10-02 | 3 | -1/+30 | |
|/ | | | | | This will filter out the validators on a particular attribute based on its kind. | |||||
* | Switch to using include? on validation callbacks | John Foley | 2012-09-23 | 1 | -2/+2 | |
| | ||||||
* | Fix collisions with before and after validation callbacks. | John Foley | 2012-09-23 | 1 | -2/+6 | |
| | | | | | | This commit allows a user to do something like: before_validation :do_stuff, :on => [ :create, :update ] after_validation :do_more, :on => [ :create, :update ] | |||||
* | add :nodoc: to AMo::DeprecatedMassAssignmentSecurity::ClassMethods [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -3/+3 | |
| | ||||||
* | change AMo::ForbiddenAttributesProtection#sanitize_for_mass_assignment to ↵ | Francesco Rodriguez | 2012-09-20 | 1 | -7/+8 | |
| | | | | protected | |||||
* | update AMo::ForbiddenAttributesError documentation [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -0/+12 | |
| | ||||||
* | add :nodoc: directives to AMo::DeprecatedMassAssignmentSecurity [ci skip] | Francesco Rodriguez | 2012-09-20 | 1 | -3/+3 | |
| | ||||||
* | Update changelogs to add entries about strong_parameters integration | Guillermo Iguaran | 2012-09-19 | 1 | -0/+11 | |
| | ||||||
* | attr_accessible and attr_protected raise an exception pointing to use plugin ↵ | Guillermo Iguaran | 2012-09-16 | 4 | -0/+39 | |
| | | | | or new protection model | |||||
* | Don't use assert_nothing_raised when assert_equal is used | Guillermo Iguaran | 2012-09-16 | 1 | -8/+2 | |
| | ||||||
* | Rename ForbiddenAttributes exception to ForbiddenAttributesError | Guillermo Iguaran | 2012-09-16 | 2 | -3/+3 | |
| | ||||||
* | Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ↵ | Guillermo Iguaran | 2012-09-16 | 1 | -8/+18 | |
| | | | | instead of monkey patch permitted? method in regular hashes | |||||
* | Remove MassAssignmentSecurity from ActiveModel | Guillermo Iguaran | 2012-09-16 | 16 | -816/+15 | |
| | | | | This will be moved out to protected_attributes gem | |||||
* | Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gem | Guillermo Iguaran | 2012-09-16 | 4 | -0/+54 | |
| | ||||||
* | remove '.rb' from require call | Nihad Abbasov | 2012-09-12 | 1 | -1/+1 | |
| | ||||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-09-09 | 1 | -3/+3 | |
|\ | | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb | |||||
| * | Added forgotten :message option to ActiveModel validates documentation | Anatoly Makarevich | 2012-09-07 | 1 | -3/+3 | |
| | | ||||||
* | | Bump builder dependencies in Active Model and Action Pack | Carlos Antonio da Silva | 2012-09-07 | 1 | -1/+1 | |
| | | ||||||
* | | Update Active Model xml serialization test to reflect a change in builder | Carlos Antonio da Silva | 2012-09-07 | 2 | -1/+12 | |
|/ | | | | | | | | | | | | | | Due to a change in builder, nil values and empty strings now generates closed tags, so instead of this: <pseudonyms nil=\"true\"></pseudonyms> It generates this: <pseudonyms nil=\"true\"/> Document this change in Rails so that people can track it down easily if necessary. | |||||
* | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 1 | -205/+1 | |
| | | | | | | | | | | Changes in old branches needed to be manually synched in CHANGELOGs of newer ones. This has proven to be brittle, sometimes one just forgets this manual step. With this commit we switch to CHANGELOGs per branch. When a new major version is cut from master, the CHANGELOGs in master start being blank. A link to the CHANGELOG of the previous branch allows anyone interested to follow the history. | |||||
* | Fix method redefined warnings. | kennyj | 2012-08-29 | 2 | -0/+6 | |
| | ||||||
* | Accept a symbol for `:in` option on inclusion and exclusion validators | Gabriel Sobrinho | 2012-08-24 | 6 | -5/+64 | |
| | ||||||
* | Fix ActiveModel tests that depend on run order | Francesco Rodriguez | 2012-08-23 | 1 | -6/+4 | |
| | ||||||
* | Get rid of config.preload_frameworks in favor of config.eager_load_namespaces | José Valim | 2012-08-21 | 2 | -4/+20 | |
| | | | | | | | The new option allows any Ruby namespace to be registered and set up for eager load. We are effectively exposing the structure existing in Rails since v3.0 for all developers in order to make their applications thread-safe and CoW friendly. | |||||
* | Merge pull request #7024 from bogdan/strict_validation_custom_exception | Rafael Mendonça França | 2012-08-16 | 4 | -5/+30 | |
|\ | | | | | | | | | | | | | AM::Validation#validates: custom exception for :strict option Conflicts: activemodel/CHANGELOG.md | |||||
| * | AM::Validation#validates: ability to pass custom exception to `:strict` option | Bogdan Gusiev | 2012-08-06 | 4 | -4/+22 | |
| | | ||||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-08-16 | 1 | -0/+11 | |
|\ \ | ||||||
| * | | add around_create callback documentation for ActiveModel::Callbacks | andrea longhi | 2012-08-08 | 1 | -0/+11 | |
| | | | ||||||
* | | | Following the false issue reporting I did here : ↵ | Anthony | 2012-08-13 | 3 | -1/+43 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/6958 - Enable propagation of :skip_types, :dasherize and :camelize on included models by default - Adding the option to override this propagation on a per-include basis (:include => { :model => { :dasherize => false } } - Enough tests to prove it works - Updated activemodel CHANGELOG.md Squashed my commits | |||||
* | | | Refactor model name logic and make it a real private class method | Carlos Antonio da Silva | 2012-08-11 | 1 | -5/+8 | |
| | | | | | | | | | | | | | | | | | | | | | Under a "private" call, class methods are not real private methods, they're public just like any other method. Make model_name_from_record_or_class a private class method, and nodoc it. | |||||
* | | | Sync CHANGELOGs [ci skip] | Rafael Mendonça França | 2012-08-11 | 1 | -0/+14 | |
| | | | ||||||
* | | | Naming helpers should first check if passed object responds to model_name | Bert Goethals | 2012-08-08 | 1 | -5/+3 | |
| |/ |/| | ||||||
* | | removes usage of Object#in? from the code base (the method remains defined ↵ | Xavier Noria | 2012-08-06 | 1 | -1/+1 | |
|/ | | | | | | | | | | | | | | | | | | | by Active Support) Selecting which key extensions to include in active_support/rails made apparent the systematic usage of Object#in? in the code base. After some discussion in https://github.com/rails/rails/commit/5ea6b0df9a36d033f21b52049426257a4637028d we decided to remove it and use plain Ruby, which seems enough for this particular idiom. In this commit the refactor has been made case by case. Sometimes include? is the natural alternative, others a simple || is the way you actually spell the condition in your head, others a case statement seems more appropriate. I have chosen the one I liked the most in each case. | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-08-04 | 15 | -278/+765 | |
|\ | | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb | |||||
| * | copy edits [ci skip] | Vijay Dev | 2012-08-04 | 1 | -1/+1 | |
| | | ||||||
| * | Fix ActiveModel::Serializers::Xml#to_xml reference | Robert Pankowecki | 2012-08-02 | 1 | -1/+1 | |
| | | | | | | | | Link to ActiveRecord::Serialization#to_xml for more details | |||||
| * | update ActiveModel::Observer documentation [ci skip] | Francesco Rodriguez | 2012-07-31 | 1 | -21/+32 | |
| | | ||||||
| * | update ActiveModel::ObserverArray documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -3/+4 | |
| | | ||||||
| * | add :nodoc: to ActiveModel::Observing#inherited [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -1/+1 | |
| | | ||||||
| * | update ActiveModel::Observing documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 1 | -25/+125 | |
| | | ||||||
| * | update ActiveModel::Serializers documentation [ci skip] | Francesco Rodriguez | 2012-07-30 | 2 | -14/+40 | |
| | |