Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Preparing for 3.2.13.rc1 release | Steve Klabnik | 2013-02-27 | 1 | -2/+2 |
| | |||||
* | Merge branch '3-2-sec' into 3-2-stable | Aaron Patterson | 2013-02-11 | 3 | -3/+3 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version remove ruby-prof Fix issue with attr_protected where malformed input could circumvent protection fixing call to columns hash. run the damn tests when you backport! Bump rack dependency to 1.4.5 Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric Conflicts: Gemfile activerecord/CHANGELOG.md | ||||
| * | bumping version | Aaron Patterson | 2013-02-10 | 1 | -1/+1 |
| | | |||||
| * | Fix issue with attr_protected where malformed input could circumvent | joernchen of Phenoelit | 2013-02-09 | 2 | -2/+2 |
| | | | | | | | | | | | | protection Fixes: CVE-2013-0276 | ||||
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: bumping version CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu Avoid Rack security warning no secret provided Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md | ||||
| * | bumping version | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge tag 'v3.2.10' into 3-2-stable | Miguel | 2013-01-03 | 1 | -1/+1 |
|\| | | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping) | ||||
| * | bumping version to 3.2.10 | Aaron Patterson | 2012-12-23 | 1 | -1/+1 |
| | | |||||
* | | handled respond_to? with private methods | SHIBATA Hiroshi | 2012-12-03 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #8352 from steveklabnik/update_7858 | Rafael Mendonça França | 2012-11-29 | 1 | -1/+6 |
|/ | | | | | | | Specify type of singular assication during serialization Conflicts: activemodel/CHANGELOG.md activemodel/test/cases/serializers/xml_serialization_test.rb | ||||
* | Bump to 3.2.9 | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
| | |||||
* | Bump up to 3.2.9.rc3 | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc2 | Santiago Pastorino | 2012-11-01 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc1 | Santiago Pastorino | 2012-10-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency | Jeremy Kemper | 2012-10-27 | 2 | -2/+6 |
| | | | | Fix AM::Serializers::Xml dependency | ||||
* | active_model/validations requires necessary files to run | Yves Senn | 2012-10-18 | 1 | -0/+1 |
| | |||||
* | Bump to 3.2.8 | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.8.rc2 | Santiago Pastorino | 2012-08-03 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.8.rc1 | Santiago Pastorino | 2012-08-01 | 1 | -2/+2 |
| | |||||
* | bumping to 3.2.7 | Aaron Patterson | 2012-07-26 | 1 | -1/+1 |
| | |||||
* | updating the version | Aaron Patterson | 2012-07-23 | 1 | -2/+2 |
| | |||||
* | `validates_inclusion_of` and `validates_exclusion_of` now accept | Rafael Mendonça França | 2012-07-20 | 2 | -10/+18 |
| | | | | | | `:within` option as alias of `:in` as documented. Fix #7118 | ||||
* | Merge branch '3-2-stable-rel' into 3-2-stable | Aaron Patterson | 2012-06-12 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | * 3-2-stable-rel: updating changelogs bumping version numbers updating changelogs with security fixes updating changelogs Array parameters should not contain nil values. Additional fix for CVE-2012-2661 | ||||
| * | bumping version numbers | Aaron Patterson | 2012-06-11 | 1 | -1/+1 |
| | | |||||
* | | Fix the the backport of the object dup with the ruby 1.9.3p194. | Angelo capilleri | 2012-06-12 | 1 | -1/+2 |
|/ | | | | | | At the end of initialize_dup was added the call to super if it exists, so it also works with 1.8.7 where initialize_dup doesn't exist. This issu was introduced with the pull request #6324 | ||||
* | Fix human attribute_name to handle deeply nested attributes | Tsutomu Kuroda | 2012-06-06 | 1 | -2/+2 |
| | | | | | This is a back-port of b0e2fc84 to Rails 3.2. See #5843 and #3859 also. | ||||
* | bumping to 3.2.5 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.4 | Aaron Patterson | 2012-05-31 | 1 | -1/+1 |
| | |||||
* | bumping to 3.2.4.rc1 | Aaron Patterson | 2012-05-28 | 1 | -2/+2 |
| | |||||
* | fix validations docs | Francesco Rodriguez | 2012-05-17 | 9 | -116/+154 |
| | |||||
* | add backport for the pull request #6324 | Angelo Capilleri | 2012-05-15 | 1 | -1/+9 |
| | |||||
* | Fix indent from previous merge | Carlos Antonio da Silva | 2012-05-15 | 1 | -2/+2 |
| | |||||
* | clean the errors if an object that includes validations errors is duped,for ↵ | Angelo capilleri | 2012-05-15 | 1 | -0/+6 |
| | | | | | | 3-2-stable It Fixes #5953 in 3-2-stable, it's the same pull request of #6284 | ||||
* | Bump up to 3.2.3 | Santiago Pastorino | 2012-03-30 | 1 | -1/+1 |
| | |||||
* | Bumping to 3.2.3.rc2 | Santiago Pastorino | 2012-03-29 | 1 | -1/+1 |
| | |||||
* | Bumping to 3.2.3.rc1 | Santiago Pastorino | 2012-03-27 | 1 | -2/+2 |
| | |||||
* | Improve docs for attr_accessible|protected related to Hash#except|slice | Carlos Antonio da Silva | 2012-03-09 | 1 | -8/+10 |
| | |||||
* | bumping to 3.2.2 | Aaron Patterson | 2012-03-01 | 1 | -1/+1 |
| | |||||
* | updating RAILS_VERSION | Aaron Patterson | 2012-02-22 | 1 | -2/+2 |
| | |||||
* | ruby 2.0 makes protected methods return false for respond_to, so pass true ↵ | Aaron Patterson | 2012-02-21 | 1 | -1/+1 |
| | | | | as the second param | ||||
* | Merge pull request #5049 from fabioyamate/master | José Valim | 2012-02-15 | 1 | -3/+3 |
| | | | | Fix sanitize_for_mass_assigment when role is nil | ||||
* | Generate strict validation error messages with attribute name | Carlos Antonio da Silva | 2012-02-01 | 2 | -10/+9 |
| | | | | Backported from master. | ||||
* | updating RAILS_VERSION | Xavier Noria | 2012-01-26 | 1 | -1/+1 |
| | |||||
* | allow requiring of 'active_model/naming' | Paul McMahon | 2012-01-25 | 1 | -1/+1 |
| | | | | | | | Requiring 'active_model/naming' will raise an uninitialized constant ActiveSupport::Deprecation exception because the module core extension doesn't require 'active_support/deprecation'. This require cannot be added to the core extension because of circular dependency issues. | ||||
* | Preparing for 3.2.0 release | David Heinemeier Hansson | 2012-01-20 | 1 | -1/+1 |
| | |||||
* | Fix ActiveModel::Errors#dup | Paweł Kondzior | 2012-01-16 | 1 | -1/+14 |
| | | | | | | | | | | | | Since ActiveModel::Errors instance keeps all error messages as hash we should duplicate this object as well. Previously ActiveModel::Errors was a subclass of ActiveSupport::OrderedHash, which results in different behavior on dup, this may result in regression for people relying on it. Because Rails 3.2 stills supports Ruby 1.8.7 in order to properly fix this regression we need to backport #initialize_dup. | ||||
* | Add ActiveModel::Errors#delete, which was not available after move to use ↵ | Piotr Sarnacki | 2012-01-16 | 1 | -0/+5 |
| | | | | delegation | ||||
* | Fix stack level too deep when model does not have attributes method. | Piotr Sarnacki | 2012-01-15 | 1 | -1/+1 |
| | | | | | | | | | | | Without that patch when using ActiveModel::AttributeMethods in a class that does not respond to `attributes` method, stack level too deep error will be raised on non existing method. While documentation is clear that you need to define `attributes` method in order to use AttributeMethods module, `stack level too deep` is rather obscure and hard to debug, therefore we should try to not break `method_missing` if someone forgets about defining `attributes`. | ||||
* | Bump to rc2 | Santiago Pastorino | 2012-01-04 | 1 | -1/+1 |
| | |||||
* | Party like its R-C-UNO! | David Heinemeier Hansson | 2011-12-19 | 1 | -1/+1 |
| |