aboutsummaryrefslogtreecommitdiffstats
path: root/config/initializers/wrap_parameters.rb
diff options
context:
space:
mode:
authorLuc Donnet2015-01-07 21:58:56 +0100
committerLuc Donnet2015-01-07 21:58:56 +0100
commitbaaed4653623cfc918ada7250c4fd879aad28893 (patch)
treeec1e7da111c2ccd95f82013e2d40d6b455f80815 /config/initializers/wrap_parameters.rb
parentc39887f2e4f6a12ab3af205c58a1330d8b28f5e9 (diff)
downloadchouette-core-baaed4653623cfc918ada7250c4fd879aad28893.tar.bz2
Fix spec and update devise usage
Diffstat (limited to 'config/initializers/wrap_parameters.rb')
-rw-r--r--config/initializers/wrap_parameters.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/initializers/wrap_parameters.rb b/config/initializers/wrap_parameters.rb
index da4fb076f..33725e95f 100644
--- a/config/initializers/wrap_parameters.rb
+++ b/config/initializers/wrap_parameters.rb
@@ -1,14 +1,14 @@
# Be sure to restart your server when you modify this file.
-#
+
# This file contains settings for ActionController::ParamsWrapper which
# is enabled by default.
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
- wrap_parameters :format => [:json]
+ wrap_parameters format: [:json] if respond_to?(:wrap_parameters)
end
-# Disable root element in JSON by default.
-ActiveSupport.on_load(:active_record) do
- self.include_root_in_json = false
-end
+# To enable root element in JSON for ActiveRecord objects.
+# ActiveSupport.on_load(:active_record) do
+# self.include_root_in_json = true
+# end