Merge remote-tracking branch 'upstream/pull/3016'

[rails.git] / config / initializers / cookies_serializer.rb

diff --git a/config/initializers/cookies_serializer.rb b/config/initializers/cookies_serializer.rb
index 7a06a89f0f9df784b2087d18b248f8d8c770eb72..5a6a32d371fe575acf9f87e2ab7e8ae4d0f11e69 100644 (file)
--- a/config/initializers/cookies_serializer.rb
+++ b/config/initializers/cookies_serializer.rb
@@ -1,3 +1,5 @@
 # Be sure to restart your server when you modify this file.
 
-Rails.application.config.action_dispatch.cookies_serializer = :json
\ No newline at end of file
+# Specify a serializer for the signed and encrypted cookie jars.
+# Valid options are :json, :marshal, and :hybrid.
+Rails.application.config.action_dispatch.cookies_serializer = :json