aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorYves Senn <yves.senn@gmail.com>2014-01-30 11:12:46 +0100
committerYves Senn <yves.senn@gmail.com>2014-01-30 11:12:46 +0100
commit02f9f3314244513fce0a94acef08318d67d6707f (patch)
treeeb6ca8eb46d99449a4f1c26dbe11a9ad0fadbb67 /actionpack
parent9632c986b4df02cc6c51dbbc2768403bd8e8c07f (diff)
downloadrails-02f9f3314244513fce0a94acef08318d67d6707f.tar.gz
rails-02f9f3314244513fce0a94acef08318d67d6707f.tar.bz2
rails-02f9f3314244513fce0a94acef08318d67d6707f.zip
tidy CHANGELOGs [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 417847cc50..394b1473d3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -5,13 +5,13 @@
* `:json` which is a secure wrapper on JSON using `JSON.parse` and
`JSON.generate` methods with quirks mode;
- * `:marshal` which is a wrapper on Marshal;
+ * `:marshal` which is a wrapper on Marshal;
* serializer class with `load` and `dump` methods defined.
For new apps `:json` option is added by default and :marshal is used
when no option is specified.
- *Łukasz Sarnacki + Matt Aimonetti*
+ *Łukasz Sarnacki*, *Matt Aimonetti*
* Ensure that `request.filtered_parameters` is reset between calls to `process`
in `ActionController::TestCase`.