diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 16:00:47 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 16:00:47 -0300 |
| commit | 1879c259b870938c42d5d52f63123bfa0b8c81c8 (patch) | |
| tree | fb11dc4b5ca6bb20092631afa02c9cb392ddb80c /actionview/CHANGELOG.md | |
| parent | 4f23760a07186ff9c0c5935c971d2978f9f57277 (diff) | |
| parent | 8b20c72dd80e2faf531f308d430a145a253aeac3 (diff) | |
| download | rails-1879c259b870938c42d5d52f63123bfa0b8c81c8.tar.gz rails-1879c259b870938c42d5d52f63123bfa0b8c81c8.tar.bz2 rails-1879c259b870938c42d5d52f63123bfa0b8c81c8.zip | |
Merge branch '4-1-0-beta2'
Conflicts:
actionview/CHANGELOG.md
activerecord/CHANGELOG.md
Diffstat (limited to 'actionview/CHANGELOG.md')
| -rw-r--r-- | actionview/CHANGELOG.md | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index cc21201903..c05ed10263 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -45,6 +45,10 @@ *Kuldeep Aggarwal* +* Escape format, negative_format and units options of number helpers + + Fixes: CVE-2014-0081 + * A Cycle object should accept an array and cycle through it as it would with a set of comma-separated objects. |