aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
Commit message (Collapse)AuthorAgeFilesLines
...
* Update changelogs to add entries about strong_parameters integrationGuillermo Iguaran2012-09-191-0/+11
|
* attr_accessible and attr_protected raise an exception pointing to use plugin ↵Guillermo Iguaran2012-09-164-0/+39
| | | | or new protection model
* Don't use assert_nothing_raised when assert_equal is usedGuillermo Iguaran2012-09-161-8/+2
|
* Rename ForbiddenAttributes exception to ForbiddenAttributesErrorGuillermo Iguaran2012-09-162-3/+3
|
* Change AMo::ForbiddenAttributesProtection tests to use a subclass of Hash ↵Guillermo Iguaran2012-09-161-8/+18
| | | | instead of monkey patch permitted? method in regular hashes
* Remove MassAssignmentSecurity from ActiveModelGuillermo Iguaran2012-09-1616-816/+15
| | | | This will be moved out to protected_attributes gem
* Integrate ActiveModel::ForbiddenAttributesProtection from StrongParameters gemGuillermo Iguaran2012-09-164-0/+54
|
* remove '.rb' from require callNihad Abbasov2012-09-121-1/+1
|
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-09-091-3/+3
|\ | | | | | | | | Conflicts: activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
| * Added forgotten :message option to ActiveModel validates documentationAnatoly Makarevich2012-09-071-3/+3
| |
* | Bump builder dependencies in Active Model and Action PackCarlos Antonio da Silva2012-09-071-1/+1
| |
* | Update Active Model xml serialization test to reflect a change in builderCarlos Antonio da Silva2012-09-072-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 branchXavier Noria2012-08-281-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.kennyj2012-08-292-0/+6
|
* Accept a symbol for `:in` option on inclusion and exclusion validatorsGabriel Sobrinho2012-08-246-5/+64
|
* Fix ActiveModel tests that depend on run orderFrancesco Rodriguez2012-08-231-6/+4
|
* Get rid of config.preload_frameworks in favor of config.eager_load_namespacesJosé Valim2012-08-212-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_exceptionRafael Mendonça França2012-08-164-5/+30
|\ | | | | | | | | | | | | AM::Validation#validates: custom exception for :strict option Conflicts: activemodel/CHANGELOG.md
| * AM::Validation#validates: ability to pass custom exception to `:strict` optionBogdan Gusiev2012-08-064-4/+22
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-08-161-0/+11
|\ \
| * | add around_create callback documentation for ActiveModel::Callbacksandrea longhi2012-08-081-0/+11
| | |
* | | Following the false issue reporting I did here : ↵Anthony2012-08-133-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 methodCarlos Antonio da Silva2012-08-111-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ça2012-08-111-0/+14
| | |
* | | Naming helpers should first check if passed object responds to model_nameBert Goethals2012-08-081-5/+3
| |/ |/|
* | removes usage of Object#in? from the code base (the method remains defined ↵Xavier Noria2012-08-061-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/docrailsVijay Dev2012-08-0415-278/+765
|\ | | | | | | | | | | Conflicts: activemodel/lib/active_model/secure_password.rb activerecord/lib/active_record/associations/collection_proxy.rb
| * copy edits [ci skip]Vijay Dev2012-08-041-1/+1
| |
| * Fix ActiveModel::Serializers::Xml#to_xml referenceRobert Pankowecki2012-08-021-1/+1
| | | | | | | | Link to ActiveRecord::Serialization#to_xml for more details
| * update ActiveModel::Observer documentation [ci skip]Francesco Rodriguez2012-07-311-21/+32
| |
| * update ActiveModel::ObserverArray documentation [ci skip]Francesco Rodriguez2012-07-301-3/+4
| |
| * add :nodoc: to ActiveModel::Observing#inherited [ci skip]Francesco Rodriguez2012-07-301-1/+1
| |
| * update ActiveModel::Observing documentation [ci skip]Francesco Rodriguez2012-07-301-25/+125
| |
| * update ActiveModel::Serializers documentation [ci skip]Francesco Rodriguez2012-07-302-14/+40
| |
| * add documentation to ActiveModel #from_json method [ci skip]Francesco Rodriguez2012-07-301-2/+34
| |
| * fix #after_validation example [ci skip]Francesco Rodriguez2012-07-301-1/+1
| |
| * add :nodoc: directives to ActiveModel Sanitizers [ci skip]Francesco Rodriguez2012-07-291-4/+4
| |
| * fix class reference in AM::MassAssignmentSecurity documentation [ci skip]Francesco Rodriguez2012-07-291-3/+3
| |
| * update ActiveModel::Validations::Callbacks documentation [ci skip]Francesco Rodriguez2012-07-291-18/+69
| |
| * update #validates and #validates! documentation [ci skip]Francesco Rodriguez2012-07-291-31/+43
| |
| * update ActiveModel::Valdations#validates_with docs [ci skip]Francesco Rodriguez2012-07-291-16/+18
| |
| * update ActiveModel::Validations docs [ci skip]Francesco Rodriguez2012-07-292-36/+127
| |
| * update ActiveModel::Validator docs [ci skip]Francesco Rodriguez2012-07-292-11/+11
| |
| * update ActiveModel::SecurePassword docs [ci skip]Francesco Rodriguez2012-07-291-18/+38
| |
| * add example to ActiveModel::StrictValidationFailed [ci skip]Francesco Rodriguez2012-07-281-0/+13
| |
| * add example to ActiveModel::MissingAttributeError [ci skip]Francesco Rodriguez2012-07-281-0/+8
| |
| * update ActiveModel::MassAssignmentSecurity docs [ci skip]Francesco Rodriguez2012-07-281-65/+177
| |
| * add example to ActiveModel::Naming#model_name [ci skip]Francesco Rodriguez2012-07-271-0/+8
| |
| * fix AM::Naming examples [ci skip]Francesco Rodriguez2012-07-271-12/+12
| |
| * add :nodoc: directive to AM::ObserverArray internal methods [ci skip]Francesco Rodriguez2012-07-221-10/+10
| |