diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 15:57:32 -0300 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-02-18 15:57:32 -0300 |
| commit | a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82 (patch) | |
| tree | 44a3f5ac94d5ea4ea5219b669d91e0e17a674d74 /actionpack/CHANGELOG.md | |
| parent | 5a84d3eb81d8d5c24233b29276aa0a0d9f7f9cb9 (diff) | |
| parent | 666e9f65bdfeb6cc5aa80b6254608adc3d7845ce (diff) | |
| download | rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.tar.gz rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.tar.bz2 rails-a3bda38467377cb8c3cdd52b6fcf6c6c31f74b82.zip | |
Merge branch '3-2-17' into 3-2-stable
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 8e5f4a4a56..a5dbfbd12d 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -5,7 +5,18 @@ *Shota Fukumori (sora_h)* -## Rails 3.2.16 ## +## Rails 3.2.17 (Feb 18, 2014) ## + +* Use the reference for the mime type to get the format + + Fixes: CVE-2014-0082 + +* Escape format, negative_format and units options of number helpers + + Fixes: CVE-2014-0081 + + +## Rails 3.2.16 (Dec 12, 2013) ## * Deep Munge the parameters for GET and POST Fixes CVE-2013-6417 |