aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-13 15:01:07 -0700
committerJosé Valim <jose.valim@gmail.com>2011-05-13 15:01:07 -0700
commita4a338167e752a4d92c64c7133ff4c975155ab7b (patch)
tree95684792d3985573586539ae1d3cd1d087384735
parent308ea60faf201c9114b05d7a7730d2c386db733c (diff)
parente987bc5469f5dc7da1c20f5c6acb51cf4af3b11c (diff)
downloadrails-a4a338167e752a4d92c64c7133ff4c975155ab7b.tar.gz
rails-a4a338167e752a4d92c64c7133ff4c975155ab7b.tar.bz2
rails-a4a338167e752a4d92c64c7133ff4c975155ab7b.zip
Merge pull request #542 from guilleiguaran/1_9_hash_style
Use new hash syntax in wrap_parameters initializer under Ruby 1.9
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt2
1 files changed, 1 insertions, 1 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 32ffbee7a1..e56195da80 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
@@ -4,7 +4,7 @@
# which will be enabled by default in the upcoming version of Ruby on Rails.
# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
-ActionController::Base.wrap_parameters :format => [:json]
+ActionController::Base.wrap_parameters <%= key_value :format, "[:json]" %>
# Disable root element in JSON by default.
if defined?(ActiveRecord)