aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/generators
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-07 14:31:51 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-06-07 14:31:51 -0700
commit6dfcc1b21de544a9c0f715d8acb8ee8829947c47 (patch)
tree470f332c7ff22fff8cf06651f794b9595095229f /railties/lib/rails/generators
parente638c613d0ecfa44ddc3d328c0979318cf73e33e (diff)
parentab11a2780fe8e059ffc8824df18037773a4f5200 (diff)
downloadrails-6dfcc1b21de544a9c0f715d8acb8ee8829947c47.tar.gz
rails-6dfcc1b21de544a9c0f715d8acb8ee8829947c47.tar.bz2
rails-6dfcc1b21de544a9c0f715d8acb8ee8829947c47.zip
Merge pull request #6597 from frodsan/am_include_root_to_false
change AMS::JSON.include_root_in_json default value to false
Diffstat (limited to 'railties/lib/rails/generators')
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt8
1 files changed, 4 insertions, 4 deletions
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
index 19cbf0e4f1..280f777cc0 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
@@ -9,8 +9,8 @@ ActiveSupport.on_load(:action_controller) do
end
<%- unless options.skip_active_record? -%>
-# 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
<%- end -%>