aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-29 13:52:25 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2014-01-29 13:52:25 -0500
commit0f156100a2d25fba820016c684cbc3d3fadbc1bd (patch)
tree3c57c279dc6a609401fd9f65d33ef5f73e7e0804 /actionpack
parentb242552430345aedd36bb0ab357089f9a0dc746f (diff)
downloadrails-0f156100a2d25fba820016c684cbc3d3fadbc1bd.tar.gz
rails-0f156100a2d25fba820016c684cbc3d3fadbc1bd.tar.bz2
rails-0f156100a2d25fba820016c684cbc3d3fadbc1bd.zip
Update CHANGELOG properly with GH #13692 [ci-skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/CHANGELOG.md28
1 files changed, 14 insertions, 14 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 60b0195510..f836b69042 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,17 @@
+* Add `:serializer` option for `config.session_store :cookie_store`. This
+ changes default serializer when using `:cookie_store` to
+ `ActionDispatch::Session::MarshalSerializer` which is wrapper on Marshal.
+
+ It is also possible to pass:
+
+ * `:json_serializer` which is secure wrapper on JSON using `JSON.parse` and
+ `JSON.generate` methods with quirks mode;
+ * any other Symbol or String like `:my_custom_serializer` which will be
+ camelized and constantized in `ActionDispatch::Session` namespace;
+ * serializer object with `load` and `dump` methods defined.
+
+ *Łukasz Sarnacki + Matt Aimonetti*
+
* Ensure that `request.filtered_parameters` is reset between calls to `process`
in `ActionController::TestCase`.
@@ -49,20 +63,6 @@
*Alessandro Diaferia*
-* Add `:serializer` option for `config.session_store :cookie_store`. This
- changes default serializer when using `:cookie_store` to
- `ActionDispatch::Session::MarshalSerializer` which is wrapper on Marshal.
-
- It is also possible to pass:
-
- * `:json_serializer` which is secure wrapper on JSON using `JSON.parse` and
- `JSON.generate` methods with quirks mode;
- * any other Symbol or String like `:my_custom_serializer` which will be
- camelized and constantized in `ActionDispatch::Session` namespace;
- * serializer object with `load` and `dump` methods defined.
-
- *Łukasz Sarnacki*
-
* Allow an absolute controller path inside a module scope. Fixes #12777.
Example: